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

pysheds to whitebox #266

Merged
merged 25 commits into from
Sep 2, 2024
Merged

pysheds to whitebox #266

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
e92c67f
Remove pysheds
Aug 23, 2024
d04c498
add whitebox
Aug 23, 2024
518f813
Attempt to fix tempfile issue
Aug 23, 2024
ac7cbc7
try fix tempfile issue
Aug 23, 2024
8157a05
provide default instead of fixing
Aug 23, 2024
f63c207
Fall back on pyflwdir by default
Aug 23, 2024
debe944
one more go at debug
Aug 23, 2024
e045a2c
Fall back on pyflwdir by default
Aug 23, 2024
7c32b7e
Fix bug
Aug 27, 2024
e23ae8b
fix the fix
Aug 27, 2024
3130f30
parameterise test
Aug 27, 2024
7aaf2dc
Chagne grid to struct
Aug 27, 2024
e8567fb
Fix mapping
Aug 27, 2024
d0d590e
Merge branch 'main' into 263-looks-like-pysheds-is-gnu
Aug 27, 2024
2ce36bd
Add verbose whitebox test
barneydobson Aug 28, 2024
33ce12b
Set max wbt procs
barneydobson Aug 28, 2024
b212c88
Merge branch 'main' into 263-looks-like-pysheds-is-gnu
barneydobson Aug 28, 2024
0f7ab3c
Use Taher's custom whitebox wrapper
barneydobson Aug 29, 2024
26201fb
Update reqs and fix tests
barneydobson Aug 29, 2024
dcc74b3
Revert to BreachDepressions and tests
barneydobson Aug 29, 2024
89c7f97
Finish review comments
barneydobson Aug 29, 2024
bbe05d5
Merge branch 'main' into 263-looks-like-pysheds-is-gnu
barneydobson Aug 29, 2024
61ac89f
Merge branch 'main' into 263-looks-like-pysheds-is-gnu
barneydobson Sep 2, 2024
e1b7171
Use cheginits pywbt
Sep 2, 2024
565fbac
Merge branch 'main' into 263-looks-like-pysheds-is-gnu
Sep 2, 2024
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
38 changes: 5 additions & 33 deletions dev-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --extra=dev --output-file=dev-requirements.txt
# pip-compile --extra=dev --output-file=dev-requirements.txt pyproject.toml
#
aenum==3.1.11
# via
Expand All @@ -11,7 +11,6 @@ aenum==3.1.11
affine==2.4.0
# via
# pyflwdir
# pysheds
# rasterio
annotated-types==0.7.0
# via pydantic
Expand Down Expand Up @@ -51,6 +50,7 @@ click==8.1.7
# pip-tools
# planetary-computer
# rasterio
# whitebox
click-plugins==1.1.1
# via
# fiona
Expand Down Expand Up @@ -86,8 +86,6 @@ fsspec==2024.6.1
# via fastparquet
geographiclib==2.0
# via geopy
geojson==3.1.0
# via pysheds
geopandas==1.0.1
# via
# osmnx
Expand All @@ -102,8 +100,6 @@ identify==2.6.0
# via pre-commit
idna==3.7
# via requests
imageio==2.34.2
# via scikit-image
iniconfig==2.0.0
# via pytest
joblib==1.4.2
Expand All @@ -116,8 +112,6 @@ jsonschema-specifications==2023.12.1
# via jsonschema
julian==0.14
# via pyswmm
lazy-loader==0.4
# via scikit-image
llvmlite==0.43.0
# via numba
loguru==0.7.2
Expand All @@ -138,20 +132,16 @@ networkx==3.3
# via
# netcomp
# osmnx
# scikit-image
# swmmanywhere (pyproject.toml)
nodeenv==1.9.1
# via pre-commit
numba==0.60.0
# via
# pyflwdir
# pysheds
# via pyflwdir
numpy==1.26.4
# via
# cftime
# fastparquet
# geopandas
# imageio
# netcdf4
# netcomp
# numba
Expand All @@ -160,15 +150,12 @@ numpy==1.26.4
# pyarrow
# pyflwdir
# pyogrio
# pysheds
# rasterio
# rioxarray
# scikit-image
# scipy
# shapely
# snuggs
# swmmanywhere (pyproject.toml)
# tifffile
# xarray
osmnx==1.9.3
# via swmmanywhere (pyproject.toml)
Expand All @@ -177,26 +164,19 @@ packaging==24.1
# build
# fastparquet
# geopandas
# lazy-loader
# planetary-computer
# pyogrio
# pyswmm
# pytest
# rioxarray
# scikit-image
# xarray
pandas==2.2.2
# via
# fastparquet
# geopandas
# osmnx
# pysheds
# swmmanywhere (pyproject.toml)
# xarray
pillow==10.4.0
# via
# imageio
# scikit-image
pip-tools==7.4.1
# via swmmanywhere (pyproject.toml)
planetary-computer==1.0.0
Expand Down Expand Up @@ -224,14 +204,11 @@ pyparsing==3.1.2
pyproj==3.6.1
# via
# geopandas
# pysheds
# rioxarray
pyproject-hooks==1.1.0
# via
# build
# pip-tools
pysheds==0.3.5
# via swmmanywhere (pyproject.toml)
pystac[validation]==1.10.1
# via
# planetary-computer
Expand Down Expand Up @@ -273,7 +250,6 @@ pyyaml==6.0.1
# swmmanywhere (pyproject.toml)
rasterio==1.3.10
# via
# pysheds
# rioxarray
# swmmanywhere (pyproject.toml)
referencing==0.35.1
Expand All @@ -296,14 +272,10 @@ rpds-py==0.19.1
# referencing
ruff==0.5.5
# via swmmanywhere (pyproject.toml)
scikit-image==0.24.0
# via pysheds
scipy==1.14.0
# via
# netcomp
# pyflwdir
# pysheds
# scikit-image
# swmmanywhere (pyproject.toml)
shapely==2.0.5
# via
Expand All @@ -320,8 +292,6 @@ snuggs==1.4.7
# via rasterio
swmm-toolkit==0.15.5
# via pyswmm
tifffile==2024.7.2
# via scikit-image
toolz==0.12.1
# via cytoolz
tqdm==4.66.4
Expand All @@ -343,6 +313,8 @@ virtualenv==20.26.3
# via pre-commit
wheel==0.43.0
# via pip-tools
whitebox==2.3.5
# via swmmanywhere (pyproject.toml)
win32-setctime==1.1.0
# via loguru
xarray==2024.6.0
Expand Down
38 changes: 5 additions & 33 deletions doc-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --extra=doc --output-file=doc-requirements.txt
# pip-compile --extra=doc --output-file=doc-requirements.txt pyproject.toml
#
aenum==3.1.11
# via
Expand All @@ -11,7 +11,6 @@ aenum==3.1.11
affine==2.4.0
# via
# pyflwdir
# pysheds
# rasterio
annotated-types==0.7.0
# via pydantic
Expand Down Expand Up @@ -57,6 +56,7 @@ click==8.1.7
# mkdocstrings
# planetary-computer
# rasterio
# whitebox
click-plugins==1.1.1
# via
# fiona
Expand Down Expand Up @@ -98,8 +98,6 @@ fsspec==2024.6.1
# via fastparquet
geographiclib==2.0
# via geopy
geojson==3.1.0
# via pysheds
geopandas==1.0.1
# via
# osmnx
Expand All @@ -116,8 +114,6 @@ griffe==0.47.0
# via mkdocstrings-python
idna==3.7
# via requests
imageio==2.34.2
# via scikit-image
ipykernel==6.29.5
# via mkdocs-jupyter
ipython==8.26.0
Expand Down Expand Up @@ -156,8 +152,6 @@ jupyterlab-pygments==0.3.0
# via nbconvert
jupytext==1.16.3
# via mkdocs-jupyter
lazy-loader==0.4
# via scikit-image
llvmlite==0.43.0
# via numba
loguru==0.7.2
Expand Down Expand Up @@ -248,18 +242,14 @@ networkx==3.3
# via
# netcomp
# osmnx
# scikit-image
# swmmanywhere (pyproject.toml)
numba==0.60.0
# via
# pyflwdir
# pysheds
# via pyflwdir
numpy==1.26.4
# via
# cftime
# fastparquet
# geopandas
# imageio
# netcdf4
# netcomp
# numba
Expand All @@ -268,15 +258,12 @@ numpy==1.26.4
# pyarrow
# pyflwdir
# pyogrio
# pysheds
# rasterio
# rioxarray
# scikit-image
# scipy
# shapely
# snuggs
# swmmanywhere (pyproject.toml)
# tifffile
# xarray
osmnx==1.9.3
# via swmmanywhere (pyproject.toml)
Expand All @@ -286,14 +273,12 @@ packaging==24.1
# geopandas
# ipykernel
# jupytext
# lazy-loader
# mkdocs
# nbconvert
# planetary-computer
# pyogrio
# pyswmm
# rioxarray
# scikit-image
# xarray
paginate==0.5.6
# via mkdocs-material
Expand All @@ -302,7 +287,6 @@ pandas==2.2.2
# fastparquet
# geopandas
# osmnx
# pysheds
# swmmanywhere (pyproject.toml)
# xarray
pandocfilters==1.5.1
Expand All @@ -311,10 +295,6 @@ parso==0.8.4
# via jedi
pathspec==0.12.1
# via mkdocs
pillow==10.4.0
# via
# imageio
# scikit-image
planetary-computer==1.0.0
# via swmmanywhere (pyproject.toml)
platformdirs==4.2.2
Expand Down Expand Up @@ -355,10 +335,7 @@ pyparsing==3.1.2
pyproj==3.6.1
# via
# geopandas
# pysheds
# rioxarray
pysheds==0.3.5
# via swmmanywhere (pyproject.toml)
pystac[validation]==1.10.1
# via
# planetary-computer
Expand Down Expand Up @@ -402,7 +379,6 @@ pyzmq==26.0.3
# jupyter-client
rasterio==1.3.10
# via
# pysheds
# rioxarray
# swmmanywhere (pyproject.toml)
referencing==0.35.1
Expand All @@ -426,14 +402,10 @@ rpds-py==0.19.1
# via
# jsonschema
# referencing
scikit-image==0.24.0
# via pysheds
scipy==1.14.0
# via
# netcomp
# pyflwdir
# pysheds
# scikit-image
# swmmanywhere (pyproject.toml)
shapely==2.0.5
# via
Expand All @@ -456,8 +428,6 @@ stack-data==0.6.3
# via ipython
swmm-toolkit==0.15.5
# via pyswmm
tifffile==2024.7.2
# via scikit-image
tinycss2==1.3.0
# via nbconvert
toolz==0.12.1
Expand Down Expand Up @@ -502,6 +472,8 @@ webencodings==0.5.1
# via
# bleach
# tinycss2
whitebox==2.3.5
# via swmmanywhere (pyproject.toml)
win32-setctime==1.1.0
# via loguru
xarray==2024.6.0
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,13 @@ dependencies = [
"netcdf4",
"netcomp@ git+https://github.com/barneydobson/NetComp.git",
"networkx>=3",
"numpy<2.0.0",
"numpy",
"osmnx",
"pandas",
"planetary_computer",
"pyarrow",
"pydantic",
"pyflwdir",
"pysheds==0.3.5",
"pystac_client",
"pyswmm",
"PyYAML",
Expand All @@ -52,6 +51,7 @@ dependencies = [
"SciPy",
"shapely",
"tqdm",
"whitebox",
"xarray",
]
[project.optional-dependencies]
Expand Down
Loading