Merge pull request #21 from openscm/more-ci

Add extra OS to test strategy

Author: znicholls

.github/workflows/ci.yaml

@@ -74,6 +74,15 @@ jobs:
         os: [ "ubuntu-latest" ]
         # Test against all security and bugfix versions: https://devguide.python.org/versions/
         python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
+        include:
+          # Include other OS for latest Python
+          # because these seem to be the flakiest from experience
+          # so are worth the extra testing
+          - os: "windows-latest"
+            python-version: "3.13"
+          - os: "macos-latest"
+            python-version: "3.13"
+
     runs-on: "${{ matrix.os }}"
     defaults:
       run:
@@ -97,6 +106,8 @@ jobs:
           uv-dependency-install-flags: "--all-extras --group tests"
       - name: Run tests
         run: |
+          # Warm up the speed tests, allowing failure
+          uv run pytest tests/integration/database/test_integration_speed.py || true
           uv run pytest -r a -v src tests --doctest-modules --cov=src --cov-report=term-missing --cov-report=xml
           uv run coverage report
       - name: Upload coverage reports to Codecov with GitHub Action
@@ -266,7 +277,8 @@ jobs:
         # Required for building the locked version of the package
         # with pdm-build-locked (see pyproject.toml)
         run: |
-          pdm lock --group :all --strategy inherit_metadata
+          pdm lock --group :all --strategy inherit_metadata --python="<3.13"
+          pdm lock --group :all  --python=">=3.13" --append
       - name: Build package
         run: |
           uv build

.github/workflows/deploy.yaml

@@ -42,7 +42,8 @@ jobs:
         # Required for building the locked version of the package
         # with pdm-build-locked (see pyproject.toml)
         run: |
-          pdm lock --group :all --strategy inherit_metadata
+          pdm lock --group :all --strategy inherit_metadata --python="<3.13"
+          pdm lock --group :all  --python=">=3.13" --append
       - name: Publish to PyPI
         run: |
           uv build

.github/workflows/release.yaml

@@ -35,7 +35,8 @@ jobs:
         # Required for building the locked version of the package
         # with pdm-build-locked (see pyproject.toml)
         run: |
-          pdm lock --group :all --strategy inherit_metadata
+          pdm lock --group :all --strategy inherit_metadata --python="<3.13"
+          pdm lock --group :all  --python=">=3.13" --append
       - name: Add version to environment
         run: |
           PROJECT_VERSION=`sed -ne 's/^version = "\([0-9\.a]*\)"/\1/p' pyproject.toml`

changelog/21.breaking.md

@@ -0,0 +1 @@
+Updated minimum numpy version to 1.26.0, the earliest that is not in end-of-life. Fixed the numpy pin for Python 3.13 to >=2.1.0, the first numpy version which supported Python 3.13.

changelog/21.trivial.md

@@ -0,0 +1,2 @@
+- Added CI for windows and mac with latest Python to try and catch edge cases earlier
+- Updated the locking and building with pdm to support different pins for different python version ranges

pyproject.toml

@@ -9,7 +9,8 @@ license = { text = "3-Clause BSD License" }
 requires-python = ">=3.9"
 dependencies = [
     "attrs>=24.3.0",
-    "numpy>=1.25.0",
+    "numpy>=1.26.0; python_version < '3.13'",
+    "numpy>=2.1.0; python_version >= '3.13'",
     "pandas>=2.2.0",
 ]
 readme = "README.md"

tests/integration/database/test_integration_speed.py

@@ -78,11 +78,11 @@ def test_overhead(groupby, tmpdir):
     stop_db_save = time.perf_counter()
     time_db_save = stop_db_save - start_db_save
 
-    # Ok, particularly given how few files we're dealing with.
+    # These tolerances are ok, particularly given how few files we're dealing with.
     # This is mainly about avoiding a factor of 10
     # (which was the difference we were getting in earlier implemenations).
-    tol_save = 0.25
-    tol_load = 0.2
+    tol_save = 2.0
+    tol_load = 2.0
 
     overhead = (time_db_save - time_pandas_save) / time_pandas_save
     assert overhead <= tol_save, f"Overhead is more than {tol_save*100}%"