Merge pull request #266 from ImperialCollegeLondon/263-looks-like-pys…

…heds-is-gnu `pysheds` to `whitebox`
ImperialCollegeLondon · Sep 2, 2024 · 5b74ed5 · 5b74ed5
2 parents 9430713 + 565fbac
commit 5b74ed5
Show file tree

Hide file tree

Showing 11 changed files with 161 additions and 282 deletions.
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -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
@@ -11,7 +11,6 @@ aenum==3.1.11
 affine==2.4.0
     # via
     #   pyflwdir
-    #   pysheds
     #   rasterio
 annotated-types==0.7.0
     # via pydantic
@@ -86,8 +85,6 @@ fsspec==2024.6.1
     # via fastparquet
 geographiclib==2.0
     # via geopy
-geojson==3.1.0
-    # via pysheds
 geopandas==1.0.1
     # via
     #   osmnx
@@ -102,8 +99,6 @@ identify==2.6.0
     # via pre-commit
 idna==3.8
     # via requests
-imageio==2.34.2
-    # via scikit-image
 iniconfig==2.0.0
     # via pytest
 joblib==1.4.2
@@ -116,8 +111,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
@@ -138,20 +131,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
@@ -160,15 +149,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)
@@ -177,26 +163,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
@@ -224,14 +203,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
@@ -267,13 +243,14 @@ pytz==2024.1
     #   multiurl
     #   pandas
     #   planetary-computer
+pywbt==0.1.1
+    # via swmmanywhere (pyproject.toml)
 pyyaml==6.0.1
     # via
     #   pre-commit
     #   swmmanywhere (pyproject.toml)
 rasterio==1.3.10
     # via
-    #   pysheds
     #   rioxarray
     #   swmmanywhere (pyproject.toml)
 referencing==0.35.1
@@ -296,14 +273,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
@@ -320,8 +293,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

diff --git a/doc-requirements.txt b/doc-requirements.txt
@@ -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
@@ -11,7 +11,6 @@ aenum==3.1.11
 affine==2.4.0
     # via
     #   pyflwdir
-    #   pysheds
     #   rasterio
 annotated-types==0.7.0
     # via pydantic
@@ -98,8 +97,6 @@ fsspec==2024.6.1
     # via fastparquet
 geographiclib==2.0
     # via geopy
-geojson==3.1.0
-    # via pysheds
 geopandas==1.0.1
     # via
     #   osmnx
@@ -116,8 +113,6 @@ griffe==0.47.0
     # via mkdocstrings-python
 idna==3.8
     # via requests
-imageio==2.34.2
-    # via scikit-image
 ipykernel==6.29.5
     # via mkdocs-jupyter
 ipython==8.26.0
@@ -156,8 +151,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
@@ -248,18 +241,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
@@ -268,15 +257,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)
@@ -286,14 +272,12 @@ packaging==24.1
     #   geopandas
     #   ipykernel
     #   jupytext
-    #   lazy-loader
     #   mkdocs
     #   nbconvert
     #   planetary-computer
     #   pyogrio
     #   pyswmm
     #   rioxarray
-    #   scikit-image
     #   xarray
 paginate==0.5.7
     # via mkdocs-material
@@ -302,7 +286,6 @@ pandas==2.2.2
     #   fastparquet
     #   geopandas
     #   osmnx
-    #   pysheds
     #   swmmanywhere (pyproject.toml)
     #   xarray
 pandocfilters==1.5.1
@@ -311,10 +294,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
@@ -355,10 +334,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
@@ -384,6 +360,8 @@ pytz==2024.1
     #   multiurl
     #   pandas
     #   planetary-computer
+pywbt==0.1.1
+    # via swmmanywhere (pyproject.toml)
 pywin32==306
     # via jupyter-core
 pyyaml==6.0.1
@@ -402,7 +380,6 @@ pyzmq==26.0.3
     #   jupyter-client
 rasterio==1.3.10
     # via
-    #   pysheds
     #   rioxarray
     #   swmmanywhere (pyproject.toml)
 referencing==0.35.1
@@ -426,14 +403,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
@@ -456,8 +429,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

diff --git a/pyproject.toml b/pyproject.toml
@@ -36,16 +36,16 @@ 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",
+  "pywbt",
   "PyYAML",
   "rasterio",
   "rioxarray",