From 34300ddb5e24c73fd7bda56222eb4f1e375d9912 Mon Sep 17 00:00:00 2001 From: elisalle Date: Thu, 19 Dec 2024 10:14:47 +0100 Subject: [PATCH 1/4] change minimum python version in pyproject.toml, update test matrix --- .github/workflows/test.yml | 20 ++++++++------------ pyproject.toml | 3 +-- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 86cad150..77e61f99 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,35 +15,31 @@ jobs: fail-fast: false matrix: include: - # 2019 - - python: 3.8 - pins: "sqlalchemy==1.4.44 alembic==1.8.* geoalchemy2==0.14.*" - display_name: "2019" # 2021 - python: 3.9 pins: "sqlalchemy==1.4.44 alembic==1.8.* geoalchemy2==0.14.*" - display_name: "2021" + display_name: "3.9" # 2022 - python: "3.10" pins: "sqlalchemy==1.4.44 alembic==1.8.* geoalchemy2==0.14.*" - display_name: "2022" + display_name: "3.10" # 2023 NumPy 1 - python: "3.11" pins: "sqlalchemy==2.0.24 alembic==1.13.1 geoalchemy2==0.14.3 numpy==1.26.4" - display_name: "2023 NumPy 1" + display_name: "3.11 NumPy 1" # 2023 NumPy 2 - python: "3.11" pins: "sqlalchemy==2.0.24 alembic==1.13.1 geoalchemy2==0.14.3 numpy==2.0.1" - display_name: "2023 NumPy 2" - # current with GDAL 3.6 + display_name: "3.11 NumPy 2" + # 2024 with GDAL 3.6 - python: "3.12" pins: "sqlalchemy==2.0.24 alembic==1.13.1 geoalchemy2==0.14.3 numpy==1.26.4" - display_name: "2024 GDAL 3.6" + display_name: "3.12 GDAL 3.6" use_gdal_36: true # current - - python: "3.12" + - python: "3.13" #pins: "sqlalchemy==2.0.* alembic==1.13.* geoalchemy2==0.14.*" - display_name: "current" + display_name: "3.13" steps: - uses: actions/checkout@v4 diff --git a/pyproject.toml b/pyproject.toml index 99d9a1f7..c84f79d5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ dynamic = ["version"] description = "Checks validity of a 3Di schematisation" readme = "README.rst" license = {text = "MIT"} -requires-python = ">=3.7" +requires-python = ">=3.9" authors = [ { name = "Nelen & Schuurmans", email = "info@nelen-schuurmans.nl" }, ] @@ -28,7 +28,6 @@ rasterio = [ ] test = [ "factory_boy", - "mock ; python_version<'3.8'", "pytest", "pytest-asyncio", "pytest-cov", From 790cfcfe67d60e11ae39d752db19cec3f9f0f81e Mon Sep 17 00:00:00 2001 From: elisalle Date: Thu, 19 Dec 2024 10:15:31 +0100 Subject: [PATCH 2/4] update changelog --- CHANGES.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.rst b/CHANGES.rst index 69246535..f0af8e69 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -7,6 +7,7 @@ Changelog of threedi-modelchecker ------------------- - Add test for check descriptions. +- Change minimum python version in pyproject.toml, update test matrix. 2.14.1 (2024-11-25) From 7aa30de41c6b2cf10cb841a01361816b15ed8b2b Mon Sep 17 00:00:00 2001 From: elisalle Date: Thu, 19 Dec 2024 10:18:13 +0100 Subject: [PATCH 3/4] change test matrix names back again --- .github/workflows/test.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 77e61f99..77f14f76 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,28 +18,28 @@ jobs: # 2021 - python: 3.9 pins: "sqlalchemy==1.4.44 alembic==1.8.* geoalchemy2==0.14.*" - display_name: "3.9" + display_name: "2021" # 2022 - python: "3.10" pins: "sqlalchemy==1.4.44 alembic==1.8.* geoalchemy2==0.14.*" - display_name: "3.10" + display_name: "2022" # 2023 NumPy 1 - python: "3.11" pins: "sqlalchemy==2.0.24 alembic==1.13.1 geoalchemy2==0.14.3 numpy==1.26.4" - display_name: "3.11 NumPy 1" + display_name: "2023 NumPy 1" # 2023 NumPy 2 - python: "3.11" pins: "sqlalchemy==2.0.24 alembic==1.13.1 geoalchemy2==0.14.3 numpy==2.0.1" - display_name: "3.11 NumPy 2" + display_name: "2023 NumPy 2" # 2024 with GDAL 3.6 - python: "3.12" pins: "sqlalchemy==2.0.24 alembic==1.13.1 geoalchemy2==0.14.3 numpy==1.26.4" - display_name: "3.12 GDAL 3.6" + display_name: "2024 GDAL 3.6" use_gdal_36: true # current - python: "3.13" #pins: "sqlalchemy==2.0.* alembic==1.13.* geoalchemy2==0.14.*" - display_name: "3.13" + display_name: "2024" steps: - uses: actions/checkout@v4 From 71abeab55dd2d0f13c672f7667e20c9917ec039a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eli=20Sall=C3=A9?= Date: Thu, 19 Dec 2024 11:18:14 +0100 Subject: [PATCH 4/4] Update CHANGES.rst Co-authored-by: margrietpalm --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index f0af8e69..0bf54aee 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -7,7 +7,7 @@ Changelog of threedi-modelchecker ------------------- - Add test for check descriptions. -- Change minimum python version in pyproject.toml, update test matrix. +- Change minimum python version to 3.9 in pyproject.toml, update test matrix. 2.14.1 (2024-11-25)