Merge branch 'main' into precipitation-planetary

.pre-commit-config.yaml

@@ -5,7 +5,7 @@ repos:
       - id: check-merge-conflict
       - id: debug-statements
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.7.4"
+    rev: "v0.8.0"
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
@@ -17,7 +17,7 @@ repos:
         additional_dependencies:
           [types-requests, types-PyYAML]
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.42.0
+    rev: v0.43.0
     hooks:
       - id: markdownlint
         args: ["--disable", "MD013", "--disable", "MD025", "--"]

src/swmmanywhere/prepare_data.py

@@ -18,6 +18,7 @@
 import rioxarray.merge as rxr_merge
 import xarray as xr
 from geopy.geocoders import Nominatim
+from packaging.version import Version
 from pyarrow import RecordBatchReader
 from pyarrow.compute import field
 from pyarrow.dataset import dataset
@@ -153,8 +154,9 @@ def download_street(
         nx.MultiDiGraph: Street network with type drive and
             ``truncate_by_edge set`` to True.
     """
-    west, south, east, north = bbox
-    bbox = (north, south, east, west)  # not sure why osmnx uses this order
+    if Version(ox.__version__) < Version("2.0.0b1"):
+        west, south, east, north = bbox
+        bbox = (north, south, east, west)
     graph = ox.graph_from_bbox(
         bbox=bbox, network_type=network_type, truncate_by_edge=True
     )
@@ -172,10 +174,12 @@ def download_river(bbox: tuple[float, float, float, float]) -> nx.MultiDiGraph:
         nx.MultiDiGraph: River network with type waterway and
             ``truncate_by_edge set`` to True.
     """
-    west, south, east, north = bbox
     try:
+        if Version(ox.__version__) < Version("2.0.0b1"):
+            west, south, east, north = bbox
+            bbox = (north, south, east, west)
         graph = ox.graph_from_bbox(
-            bbox=(north, south, east, west),
+            bbox=bbox,
             truncate_by_edge=True,
             custom_filter='["waterway"]',
             retain_all=True,