Merge branch 'main' into swmm_text_tools

ImperialCollegeLondon · Jan 29, 2024 · 476a1e3 · 476a1e3
2 parents 4e0015f + 0dc06ff
commit 476a1e3
Show file tree

Hide file tree

Showing 8 changed files with 570 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # SWMManywhere
-
+<!-- markdown-link-check-disable -->
 [![Test and build](https://github.com/ImperialCollegeLondon/SWMManywhere/actions/workflows/ci.yml/badge.svg)](https://github.com/ImperialCollegeLondon/SWMManywhere/actions/workflows/ci.yml)
+<!-- markdown-link-check-enable -->
 
 ## High level workflow overview
 

diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -149,9 +149,9 @@ numpy==1.26.3
     #   osmnx
     #   pandas
     #   pyarrow
-    #   pygeos
     #   pysheds
     #   rasterio
+    #   rioxarray
     #   salib
     #   scikit-image
     #   scipy
@@ -170,6 +170,7 @@ packaging==23.2
     #   matplotlib
     #   pyswmm
     #   pytest
+    #   rioxarray
     #   scikit-image
     #   xarray
 pandas==2.1.4
@@ -196,8 +197,6 @@ pre-commit==3.6.0
     # via swmmanywhere (pyproject.toml)
 pyarrow==14.0.2
     # via swmmanywhere (pyproject.toml)
-pygeos==0.14
-    # via swmmanywhere (pyproject.toml)
 pyparsing==3.1.1
     # via
     #   matplotlib
@@ -206,6 +205,7 @@ pyproj==3.6.1
     # via
     #   geopandas
     #   pysheds
+    #   rioxarray
 pyproject-hooks==1.0.0
     # via build
 pysheds==0.3.5
@@ -237,11 +237,14 @@ pyyaml==6.0.1
 rasterio==1.3.9
     # via
     #   pysheds
+    #   rioxarray
     #   swmmanywhere (pyproject.toml)
 requests==2.31.0
     # via
     #   cdsapi
     #   osmnx
+rioxarray==0.15.1
+    # via swmmanywhere (pyproject.toml)
 ruff==0.1.11
     # via swmmanywhere (pyproject.toml)
 salib==1.4.7
@@ -289,7 +292,9 @@ virtualenv==20.24.5
 wheel==0.41.3
     # via pip-tools
 xarray==2023.12.0
-    # via swmmanywhere (pyproject.toml)
+    # via
+    #   rioxarray
+    #   swmmanywhere (pyproject.toml)
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip

diff --git a/pyproject.toml b/pyproject.toml
@@ -27,11 +27,11 @@ dependencies = [ # TODO definitely don't need all of these
                 "osmnx",
                 "pandas",
                 "pyarrow",
-                "pygeos",
                 "pysheds",
                 "pyswmm",
                 "PyYAML",
                 "rasterio",
+                "rioxarray",
                 "SALib",
                 "SciPy",
                 "shapely",

diff --git a/requirements.txt b/requirements.txt
@@ -119,9 +119,9 @@ numpy==1.26.3
     #   osmnx
     #   pandas
     #   pyarrow
-    #   pygeos
     #   pysheds
     #   rasterio
+    #   rioxarray
     #   salib
     #   scikit-image
     #   scipy
@@ -138,6 +138,7 @@ packaging==23.2
     #   geopandas
     #   matplotlib
     #   pyswmm
+    #   rioxarray
     #   scikit-image
     #   xarray
 pandas==2.1.4
@@ -156,8 +157,6 @@ pillow==10.2.0
     #   scikit-image
 pyarrow==14.0.2
     # via swmmanywhere (pyproject.toml)
-pygeos==0.14
-    # via swmmanywhere (pyproject.toml)
 pyparsing==3.1.1
     # via
     #   matplotlib
@@ -166,6 +165,7 @@ pyproj==3.6.1
     # via
     #   geopandas
     #   pysheds
+    #   rioxarray
 pysheds==0.3.5
     # via swmmanywhere (pyproject.toml)
 pyswmm==1.5.1
@@ -181,11 +181,14 @@ pyyaml==6.0.1
 rasterio==1.3.9
     # via
     #   pysheds
+    #   rioxarray
     #   swmmanywhere (pyproject.toml)
 requests==2.31.0
     # via
     #   cdsapi
     #   osmnx
+rioxarray==0.15.1
+    # via swmmanywhere (pyproject.toml)
 salib==1.4.7
     # via swmmanywhere (pyproject.toml)
 scikit-image==0.22.0
@@ -225,7 +228,9 @@ tzdata==2023.4
 urllib3==2.1.0
     # via requests
 xarray==2023.12.0
-    # via swmmanywhere (pyproject.toml)
+    # via
+    #   rioxarray
+    #   swmmanywhere (pyproject.toml)
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools