Merge branch 'master' into margriet_376_schema_300_inflow

nens · Jul 24, 2024 · a1c1ea7 · a1c1ea7
2 parents 28899bd + 13b00b1
commit a1c1ea7
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 11 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -17,19 +17,22 @@ jobs:
         include:
           # 2019
           - python: 3.8
-            pins: "sqlalchemy==1.4.44 alembic==1.8.* geoalchemy2==0.14.* rasterio==1.3.0"
+            pins: "sqlalchemy==1.4.44 alembic==1.8.* geoalchemy2==0.14.*"
           # 2021
           - python: 3.9
-            pins: "sqlalchemy==1.4.44 alembic==1.8.* geoalchemy2==0.14.* rasterio==1.3.3"
+            pins: "sqlalchemy==1.4.44 alembic==1.8.* geoalchemy2==0.14.*"
           # 2022
           - python: "3.10"
-            pins: "sqlalchemy==1.4.44 alembic==1.8.* geoalchemy2==0.14.* rasterio==1.3.5.post1"
-          # 2023
+            pins: "sqlalchemy==1.4.44 alembic==1.8.* geoalchemy2==0.14.*"
+          # 2023 NumPy 1
           - python: "3.11"
-            pins: "sqlalchemy==2.0.24 alembic==1.13.1 geoalchemy2==0.14.3 rasterio==1.3.9"
+            pins: "sqlalchemy==2.0.24 alembic==1.13.1 geoalchemy2==0.14.3 numpy==1.26.4"
+          # 2023 NumPy 2
+          - python: "3.11"
+            pins: "sqlalchemy==2.0.24 alembic==1.13.1 geoalchemy2==0.14.3 numpy==2.0.1"
           # current
           - python: "3.12"
-            #pins: "sqlalchemy==2.0.* alembic==1.13.* geoalchemy2==0.14.* rasterio==1.3.9.*"
+            #pins: "sqlalchemy==2.0.* alembic==1.13.* geoalchemy2==0.14.*"
 
     steps:
       - uses: actions/checkout@v3
@@ -50,7 +53,8 @@ jobs:
         shell: bash
         run: |
           pip install --disable-pip-version-check --upgrade pip setuptools wheel
-          pip install ${{ matrix.pins }} .[test,rasterio] pygdal==$(gdal-config --version).*
+          pip install ${{ matrix.pins }} .[test,rasterio]
+          pip install GDAL==$(gdal-config --version) --no-build-isolation # install gdal AFTER numpy
           pip list
 
       - name: Run tests

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -2,12 +2,19 @@ Changelog of threedi-modelchecker
 =================================
 
 
-2.8.1 (unreleased)
+2.8.2 (unreleased)
 ------------------
 
 - Adapt modelchecker to work with schema upgrades for inflow (0.223)
 
 
+2.8.1 (2024-07-24)
+------------------
+
+- Add explicit support for NumPy 2.
+- Require rasterio>=1.3.10.
+
+
 2.8.0 (2024-05-22)
 ------------------
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -24,7 +24,7 @@ dependencies = [
 
 [project.optional-dependencies]
 rasterio = [
-    "rasterio>=1.3",
+    "rasterio>=1.3.10",
 ]
 test = [
     "factory_boy",

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -6,4 +6,4 @@ threedi-api-client
 aiofiles
 aiohttp
 pytest-asyncio
-numpy
+numpy>=1.15,<3.0
diff --git a/threedi_modelchecker/__init__.py b/threedi_modelchecker/__init__.py
@@ -1,5 +1,5 @@
 from .model_checks import *  # NOQA
 
 # fmt: off
-__version__ = '2.8.1.dev0'
+__version__ = '2.8.2.dev0'
 # fmt: on