Drop Python 3.10 support (#2012)

I tried to add 3.13 to as the default environment but this cannot
resolve yet due to for instance numba not supporting it yet (via the
xugrid) optional dependency.

Also adds compat bounds for our python depdencies.

This follows https://scientific-python.org/specs/spec-0000/.

Author: visr

.github/workflows/python_tests.yml

@@ -24,7 +24,6 @@ jobs:
         pixi-environment:
           - py312
           - py311
-          - py310
     steps:
       - uses: actions/checkout@v4
       - uses: prefix-dev/[email protected]

pixi.lock

@@ -166,33 +166,33 @@ install-ci = { depends-on = [
 ] }
 
 [dependencies]
-geopandas = "*"
+geopandas = ">=1.0"
 hatchling = "*"
 ipykernel = ">=6.29"
-ipywidgets = ">=8.1.3,<8.2"
+ipywidgets = ">=8.1.3"
 jinja2 = "*"
-matplotlib = "*"
+matplotlib = ">=3.7"
 minio = "*"
 netcdf4 = "*"
 networkx = ">=3.3"
-numpy = "*"
-pandas = "*"
+numpy = ">=1.25"
+pandas = ">=2.0"
 pandas-stubs = "*"
 pandera = ">=0.20"
 pip = "*"
-pyarrow = "*"
-pydantic = ">=2"
-pyogrio = "*"
+pyarrow = ">=17.0"
+pydantic = ">=2.0"
+pyogrio = ">=0.8"
 pytest = "*"
 pytest-cov = "*"
 pytest-xdist = "*"
-python = ">=3.10"
+python = ">=3.11"
 shapely = ">=2.0"
 teamcity-messages = "*"
-tomli = "*"
-tomli-w = "*"
+tomli = ">=2.0"
+tomli-w = ">=1.0"
 xarray = "*"
-xmipy = "*"
+xmipy = ">=1.3"
 xugrid = "*"
 
 [pypi-dependencies]
@@ -226,9 +226,6 @@ python = "3.12.*"
 [feature.py311.dependencies]
 python = "3.11.*"
 
-[feature.py310.dependencies]
-python = "3.10.*"
-
 [target.win-64.dependencies]
 rcedit = "*"
 
@@ -237,7 +234,6 @@ default = { features = ["py312"], solve-group = "py312" }
 dev = { features = ["py312", "dev"], solve-group = "py312" }
 py312 = { features = ["py312"], solve-group = "py312" }
 py311 = ["py311"]
-py310 = ["py310"]
 
 [system-requirements]
 linux = "3.10.0"

pixi.toml

@@ -14,19 +14,19 @@ classifiers = [
     "Intended Audience :: Science/Research",
     "Topic :: Scientific/Engineering :: Hydrology",
 ]
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 dependencies = [
-    "geopandas",
-    "matplotlib",
-    "numpy",
-    "pandas",
-    "pandera >= 0.20",
-    "pyarrow",
-    "pydantic ~= 2.0",
-    "pyogrio",
-    "shapely >= 2.0",
-    "tomli",
-    "tomli-w",
+    "geopandas >=1.0",
+    "matplotlib >=3.7",
+    "numpy >=1.25",
+    "pandas >=2.0",
+    "pandera >=0.20",
+    "pyarrow >=17.0",
+    "pydantic >=2.0",
+    "pyogrio >=0.8",
+    "shapely >=2.0",
+    "tomli >=2.0",
+    "tomli-w >=1.0",
 ]
 dynamic = ["version"]
 

python/ribasim/pyproject.toml

@@ -1,7 +1,7 @@
 import numbers
 from collections.abc import Sequence
 from enum import Enum
-from typing import Any, Optional
+from typing import Any
 
 import numpy as np
 import pandas as pd
@@ -175,7 +175,7 @@ class Node(pydantic.BaseModel):
         Optionally adds this node to a subnetwork, which is input for the allocation algorithm.
     """
 
-    node_id: Optional[NonNegativeInt] = None
+    node_id: NonNegativeInt | None = None
     geometry: Point
     name: str = ""
     subnetwork_id: int | None = None
@@ -184,7 +184,7 @@ class Node(pydantic.BaseModel):
 
     def __init__(
         self,
-        node_id: Optional[NonNegativeInt] = None,
+        node_id: NonNegativeInt | None = None,
         geometry: Point = Point(),
         **kwargs,
     ) -> None:

python/ribasim/ribasim/config.py

@@ -1,4 +1,4 @@
-from typing import NamedTuple, Optional
+from typing import NamedTuple
 
 import matplotlib.pyplot as plt
 import numpy as np
@@ -72,7 +72,7 @@ def add(
         to_node: NodeData,
         geometry: LineString | MultiLineString | None = None,
         name: str = "",
-        edge_id: Optional[NonNegativeInt] = None,
+        edge_id: NonNegativeInt | None = None,
         **kwargs,
     ):
         """

python/ribasim/ribasim/geometry/edge.py

@@ -169,7 +169,7 @@ class TableModel(FileModel, Generic[TableT]):
     @classmethod
     def _check_schema(cls, v: DataFrame[TableT]):
         """Allow only extra columns with `meta_` prefix."""
-        if isinstance(v, (pd.DataFrame, gpd.GeoDataFrame)):
+        if isinstance(v, pd.DataFrame | gpd.GeoDataFrame):
             # On reading from geopackage, migrate the tables when necessary
             db_path = context_file_loading.get().get("database")
             if db_path is not None:
@@ -435,7 +435,7 @@ def set_modeld(
     @classmethod
     def set_sort_keys(cls, v: Any, info: ValidationInfo) -> Any:
         """Set sort keys for all TableModels if present in FieldInfo."""
-        if isinstance(v, (TableModel,)):
+        if isinstance(v, TableModel):
             field = cls.model_fields[getattr(info, "field_name")]
             extra = field.json_schema_extra
             if extra is not None and isinstance(extra, dict):

python/ribasim/ribasim/input_base.py

@@ -1,6 +1,7 @@
 # Automatically generated file. Do not modify.
 
-from typing import Annotated, Any, Callable
+from collections.abc import Callable
+from typing import Annotated, Any
 
 import pandas as pd
 import pandera as pa

python/ribasim/ribasim/schemas.py

@@ -12,9 +12,9 @@ classifiers = [
     "Intended Audience :: Science/Research",
     "Topic :: Scientific/Engineering :: Hydrology",
 ]
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 dependencies = [
-    "xmipy"
+    "xmipy >=1.3"
 ]
 dynamic = ["version"]
 

python/ribasim_api/pyproject.toml

@@ -12,8 +12,13 @@ classifiers = [
     "Intended Audience :: Science/Research",
     "Topic :: Scientific/Engineering :: Hydrology",
 ]
-requires-python = ">=3.10"
-dependencies = ["ribasim", "geopandas", "numpy", "pandas"]
+requires-python = ">=3.11"
+dependencies = [
+    "geopandas >=1.0",
+    "numpy >=1.25",
+    "pandas >=2.0",
+    "ribasim",
+]
 dynamic = ["version"]
 
 [project.optional-dependencies]