Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/update requirements #63

Merged
merged 2 commits into from
Sep 25, 2023
Merged

Feature/update requirements #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6ce95c
alphabetize tests, add test_macdonald_displacement_height()
erexer Sep 20, 2023
2312051
update requirements.txt
erexer Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 35 additions & 24 deletions intro.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,22 @@
},
{
"cell_type": "code",
"execution_count": 1,
"execution_count": 9,
"id": "252f0a4f-786b-4a54-b2c1-c352a60c31be",
"metadata": {
"tags": []
},
"outputs": [],
"source": [
"import geopandas as gpd\n",
"\n",
"from naturf.config import Settings\n",
"import naturf.nodes as nodes"
]
},
{
"cell_type": "code",
"execution_count": 2,
"execution_count": 10,
"id": "e83ec3da-ce62-4a75-a60e-c7860b757e7d",
"metadata": {
"tags": []
Expand All @@ -41,7 +44,7 @@
},
{
"cell_type": "code",
"execution_count": 3,
"execution_count": 11,
"id": "aea95ae0-2387-4258-8e24-afef0944fa90",
"metadata": {
"tags": []
Expand All @@ -60,7 +63,7 @@
},
{
"cell_type": "code",
"execution_count": 4,
"execution_count": 12,
"id": "21ffd993-8c89-4991-b67d-dfed058fbf56",
"metadata": {},
"outputs": [],
Expand All @@ -80,7 +83,7 @@
},
{
"cell_type": "code",
"execution_count": 5,
"execution_count": 13,
"id": "17f4392a-efb1-4d67-b43a-9963ad388437",
"metadata": {
"tags": []
Expand All @@ -95,7 +98,7 @@
},
{
"cell_type": "code",
"execution_count": 6,
"execution_count": 14,
"id": "13aa785f-638a-4011-adba-274f27400c4c",
"metadata": {},
"outputs": [],
Expand All @@ -107,7 +110,7 @@
},
{
"cell_type": "code",
"execution_count": 7,
"execution_count": 15,
"id": "fad209f4-28dc-4999-9196-673ade6365bd",
"metadata": {
"tags": []
Expand All @@ -122,7 +125,7 @@
},
{
"cell_type": "code",
"execution_count": 8,
"execution_count": 16,
"id": "4498eec3-0786-4318-95ae-fe03ba42e605",
"metadata": {
"tags": []
Expand All @@ -136,7 +139,7 @@
},
{
"cell_type": "code",
"execution_count": 9,
"execution_count": 17,
"id": "f170e200-4e94-476a-baaa-e322300eee05",
"metadata": {},
"outputs": [],
Expand All @@ -149,7 +152,7 @@
},
{
"cell_type": "code",
"execution_count": 10,
"execution_count": 18,
"id": "aac24c35-28c4-415a-ba10-478886d15713",
"metadata": {
"scrolled": true,
Expand All @@ -168,7 +171,7 @@
},
{
"cell_type": "code",
"execution_count": 11,
"execution_count": 19,
"id": "6c2e11b6-9fb6-4f1d-af4f-fcae87aa510b",
"metadata": {
"scrolled": true,
Expand Down Expand Up @@ -203,7 +206,7 @@
},
{
"cell_type": "code",
"execution_count": 12,
"execution_count": 20,
"id": "c38dd0e9-87f0-4b49-8992-45d1c36352d1",
"metadata": {},
"outputs": [
Expand Down Expand Up @@ -694,7 +697,7 @@
"[192 rows x 133 columns]"
]
},
"execution_count": 12,
"execution_count": 20,
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -705,7 +708,7 @@
},
{
"cell_type": "code",
"execution_count": 14,
"execution_count": 21,
"id": "0809c864-a591-4a38-90ac-75994b1ac417",
"metadata": {},
"outputs": [
Expand All @@ -715,7 +718,7 @@
"<Axes: >"
]
},
"execution_count": 14,
"execution_count": 21,
"metadata": {},
"output_type": "execute_result"
},
Expand All @@ -736,7 +739,7 @@
},
{
"cell_type": "code",
"execution_count": 15,
"execution_count": 22,
"id": "786be11f-d371-4dfb-a687-ceef830352dc",
"metadata": {},
"outputs": [],
Expand All @@ -750,17 +753,17 @@
},
{
"cell_type": "code",
"execution_count": 16,
"execution_count": 23,
"id": "0958afc9-3186-4768-97fa-df3bcde91307",
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
"<matplotlib.collections.QuadMesh at 0x20dcad502d0>"
"<matplotlib.collections.QuadMesh at 0x147d22ad0>"
]
},
"execution_count": 16,
"execution_count": 23,
"metadata": {},
"output_type": "execute_result"
},
Expand All @@ -781,7 +784,7 @@
},
{
"cell_type": "code",
"execution_count": 17,
"execution_count": 24,
"id": "fa0db746-8483-4276-bebe-b90551524993",
"metadata": {},
"outputs": [],
Expand All @@ -795,17 +798,17 @@
},
{
"cell_type": "code",
"execution_count": 18,
"execution_count": 25,
"id": "f7de3552-6764-4da9-978a-bf73a5e08dd0",
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
"<matplotlib.collections.QuadMesh at 0x20dcfb313d0>"
"<matplotlib.collections.QuadMesh at 0x147e25090>"
]
},
"execution_count": 18,
"execution_count": 25,
"metadata": {},
"output_type": "execute_result"
},
Expand All @@ -826,7 +829,7 @@
},
{
"cell_type": "code",
"execution_count": 19,
"execution_count": 26,
"id": "1bfceddd-c93c-49d5-abff-fe981dfe0d68",
"metadata": {},
"outputs": [],
Expand All @@ -835,6 +838,14 @@
"nodes.write_binary(numpy_to_binary, raster_to_numpy)\n",
"nodes.write_index(raster_to_numpy, building_geometry, target_crs)"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "4803477d-19d9-46b1-a7f2-874754f42d29",
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
Expand Down
48 changes: 36 additions & 12 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,36 @@
fiona>=1.8.19
geocube>=0.3.1
geopandas>=0.10.2
joblib>=1.0.1
numpy>=1.22.4
pandas>=1.4.2
pyproj>=3.0.1
rasterio>=1.2.10
rtree>=1.0.0
sf-hamilton[visualization]>=1.10
shapely>=1.8.2,<2
xarray>=2022.3.0
affine==2.4.0
appdirs==1.4.4
attrs==23.1.0
cachetools==5.3.1
certifi==2023.7.22
click==8.1.7
click-plugins==1.1.1
cligj==0.7.2
Fiona==1.9.4.post1
geocube==0.4.2
geopandas==0.14.0
graphviz==0.20.1
joblib==1.3.2
mypy-extensions==1.0.0
-e git+ssh://git@github.com/IMMM-SFA/naturf.git@f6ce95c245b9be3f7c7d4fdd44d54b779ec7eb17#egg=naturf
networkx==3.1
numpy==1.26.0
odc-geo==0.4.1
packaging==23.1
pandas==2.1.0
pyparsing==3.1.1
pyproj==3.6.0
python-dateutil==2.8.2
pytz==2023.3.post1
rasterio==1.3.8
rioxarray==0.15.0
Rtree==1.0.1
scipy==1.11.2
sf-hamilton==1.29.0
Shapely==1.8.5.post1
six==1.16.0
snuggs==1.4.7
typing-inspect==0.9.0
typing_extensions==4.8.0
tzdata==2023.3
xarray==2023.8.0
Loading