From 90772d3876fcc54c8828983d5c6fe35710237790 Mon Sep 17 00:00:00 2001 From: elisalle Date: Thu, 18 Jul 2024 12:11:44 +0200 Subject: [PATCH 01/10] pin numpy to less than 2 --- CHANGES.rst | 2 +- pyproject.toml | 1 + requirements-dev.txt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index b7f2d134..ee7f542f 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,7 +5,7 @@ Changelog of threedi-modelchecker 2.8.1 (unreleased) ------------------ -- Nothing changed yet. +- Pin NumPy to less than 2.0.0 2.8.0 (2024-05-22) diff --git a/pyproject.toml b/pyproject.toml index 99f7f423..7edbdb74 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,6 +32,7 @@ test = [ "pytest", "pytest-asyncio", "pytest-cov", + "numpy<2.0.0" ] [project.scripts] diff --git a/requirements-dev.txt b/requirements-dev.txt index 372aa0d4..e1c1191d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -6,4 +6,4 @@ threedi-api-client aiofiles aiohttp pytest-asyncio -numpy +numpy<2.0.0 From 445fe8c8674d70ec530d205799c2f1f91314c7fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eli=20Sall=C3=A9?= Date: Thu, 18 Jul 2024 12:16:44 +0200 Subject: [PATCH 02/10] simplify pin --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 7edbdb74..b9d43db7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,7 @@ test = [ "pytest", "pytest-asyncio", "pytest-cov", - "numpy<2.0.0" + "numpy<2" ] [project.scripts] From ce5fc34f165081da4697d873ebc4d79bd0649cf6 Mon Sep 17 00:00:00 2001 From: elisalle Date: Thu, 18 Jul 2024 13:48:58 +0200 Subject: [PATCH 03/10] pin minimum numpy version --- pyproject.toml | 2 +- requirements-dev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index b9d43db7..fad1d221 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,7 @@ test = [ "pytest", "pytest-asyncio", "pytest-cov", - "numpy<2" + "numpy>=1.15,<2.0", ] [project.scripts] diff --git a/requirements-dev.txt b/requirements-dev.txt index e1c1191d..d2e50a43 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -6,4 +6,4 @@ threedi-api-client aiofiles aiohttp pytest-asyncio -numpy<2.0.0 +numpy>=1.15,<2.0 From 036503de2dfeb99d877de18369def88fa0e82ff7 Mon Sep 17 00:00:00 2001 From: elisalle Date: Tue, 23 Jul 2024 16:05:11 +0200 Subject: [PATCH 04/10] add nominal numpy 2 support --- .github/workflows/test.yml | 10 +++++++++- pyproject.toml | 2 +- requirements-dev.txt | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6ab7418e..80287c63 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,6 +27,12 @@ jobs: # 2023 - python: "3.11" pins: "sqlalchemy==2.0.24 alembic==1.13.1 geoalchemy2==0.14.3 rasterio==1.3.9" + # NumPy 1 + - python: "3.11" + pins: "sqlalchemy==2.0.24 alembic==1.13.1 geoalchemy2==0.14.3 rasterio==1.3.9 numpy==1.26.4" + # NumPy 2 + - python: "3.11" + pins: "sqlalchemy==2.0.24 alembic==1.13.1 geoalchemy2==0.14.3 rasterio==1.3.9 numpy==2.0.1" # current - python: "3.12" #pins: "sqlalchemy==2.0.* alembic==1.13.* geoalchemy2==0.14.* rasterio==1.3.9.*" @@ -50,7 +56,9 @@ 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 }} + pip install .[test,rasterio] + pip install GDAL==$(gdal-config --version) --no-build-isolation # install gdal AFTER numpy pip list - name: Run tests diff --git a/pyproject.toml b/pyproject.toml index fad1d221..b8d665f1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,7 @@ test = [ "pytest", "pytest-asyncio", "pytest-cov", - "numpy>=1.15,<2.0", + "numpy>=1.15,<3.0", ] [project.scripts] diff --git a/requirements-dev.txt b/requirements-dev.txt index d2e50a43..89a1e718 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -6,4 +6,4 @@ threedi-api-client aiofiles aiohttp pytest-asyncio -numpy>=1.15,<2.0 +numpy>=1.15,<3.0 From 2c596a9f6016681ace3b93cec9be159ebdb5f6bc Mon Sep 17 00:00:00 2001 From: elisalle Date: Tue, 23 Jul 2024 16:17:04 +0200 Subject: [PATCH 05/10] remove numpy from test dependencies in pyproject.toml to avoid conflicts --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b8d665f1..99f7f423 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,6 @@ test = [ "pytest", "pytest-asyncio", "pytest-cov", - "numpy>=1.15,<3.0", ] [project.scripts] From 8d102fc9669a2cc10dd0195587a2472328369ba3 Mon Sep 17 00:00:00 2001 From: elisalle Date: Tue, 23 Jul 2024 17:13:32 +0200 Subject: [PATCH 06/10] pin rasterio to at least 1.3.10 to support numpy 2 --- .github/workflows/test.yml | 19 ++++++++----------- pyproject.toml | 2 +- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 80287c63..f8f80ad1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,25 +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" - # NumPy 1 + 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 rasterio==1.3.9 numpy==1.26.4" - # NumPy 2 - - python: "3.11" - pins: "sqlalchemy==2.0.24 alembic==1.13.1 geoalchemy2==0.14.3 rasterio==1.3.9 numpy==2.0.1" + 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 diff --git a/pyproject.toml b/pyproject.toml index 99f7f423..32356497 100644 --- 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", From ed2cc5582fee520c29585ce5a686f3c7285b5f37 Mon Sep 17 00:00:00 2001 From: elisalle Date: Wed, 24 Jul 2024 09:59:01 +0200 Subject: [PATCH 07/10] install pins and package in same command --- .github/workflows/test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f8f80ad1..5a005f0c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -53,8 +53,7 @@ jobs: shell: bash run: | pip install --disable-pip-version-check --upgrade pip setuptools wheel - pip install ${{ matrix.pins }} - pip install .[test,rasterio] + pip install ${{ matrix.pins }} .[test,rasterio] pip install GDAL==$(gdal-config --version) --no-build-isolation # install gdal AFTER numpy pip list From 45786fa7d4842703e80a9240969bf36925a4b8fb Mon Sep 17 00:00:00 2001 From: elisalle Date: Wed, 24 Jul 2024 10:04:12 +0200 Subject: [PATCH 08/10] update changelog --- CHANGES.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index ee7f542f..45b0fa07 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,7 +5,8 @@ Changelog of threedi-modelchecker 2.8.1 (unreleased) ------------------ -- Pin NumPy to less than 2.0.0 +- Add explicit support for NumPy 2. +- Require rasterio>=1.3.10. 2.8.0 (2024-05-22) From 8ee77ad3d27cd49a4dcfa5bb63466ee45a87cc91 Mon Sep 17 00:00:00 2001 From: elisalle Date: Wed, 24 Jul 2024 12:01:42 +0200 Subject: [PATCH 09/10] Preparing release 2.8.1 --- CHANGES.rst | 2 +- threedi_modelchecker/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 45b0fa07..19f353b7 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,7 +2,7 @@ Changelog of threedi-modelchecker ================================= -2.8.1 (unreleased) +2.8.1 (2024-07-24) ------------------ - Add explicit support for NumPy 2. diff --git a/threedi_modelchecker/__init__.py b/threedi_modelchecker/__init__.py index b9346fc8..cdd4255a 100644 --- 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.1' # fmt: on From 13b00b1acc6b8e634dad44b04a17a66f49b6a40f Mon Sep 17 00:00:00 2001 From: elisalle Date: Wed, 24 Jul 2024 12:01:48 +0200 Subject: [PATCH 10/10] Back to development: 2.8.2 --- CHANGES.rst | 6 ++++++ threedi_modelchecker/__init__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 19f353b7..549b0b35 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,6 +2,12 @@ Changelog of threedi-modelchecker ================================= +2.8.2 (unreleased) +------------------ + +- Nothing changed yet. + + 2.8.1 (2024-07-24) ------------------ diff --git a/threedi_modelchecker/__init__.py b/threedi_modelchecker/__init__.py index cdd4255a..39eb84ed 100644 --- 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' +__version__ = '2.8.2.dev0' # fmt: on