Merge branch 'main' of github.com:Climate-REF/climate-ref into add-metric-esmvaltool-zec

Author: bouweandela

.bumpversion.toml

@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "0.2.0"
+current_version = "0.3.1"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"

.github/workflows/ci-integration.yaml

@@ -12,36 +12,16 @@ on:
     - cron: '2 15 * * *'
 
 jobs:
-  tests:
-    # These tests are also run on each push to main and tagged version via the `ci` workflow
-    if: github.event_name != 'push'
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ "ubuntu-latest" ]
-        python-version: [ "3.10", "3.11", "3.12", "3.13" ]
-    runs-on: "${{ matrix.os }}"
-    defaults:
-      run:
-        shell: bash
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - uses: ./.github/actions/setup
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Run tests
-        run: |
-          make fetch-test-data
-          make test
   tests-slow:
     env:
       REF_TEST_OUTPUT: "test-outputs"
+      REF_METRICS_ILAMB_DATA_DIR: "data/ilamb"
+      PYTEST_ADDOPTS: "--slow"
     strategy:
       fail-fast: false
       matrix:
         os: [ "ubuntu-latest" ]
-        python-version: [ "3.10" ]
+        python-version: [ "3.11", "3.12", "3.13" ]
     runs-on: "${{ matrix.os }}"
     defaults:
       run:
@@ -52,11 +32,17 @@ jobs:
       - uses: ./.github/actions/setup
         with:
           python-version: ${{ matrix.python-version }}
+      - name: Cache downloaded ILAMB data
+        uses: actions/cache@v4
+        with:
+          path: |
+            ${{ env.REF_METRICS_ILAMB_DATA_DIR }}
+          key: ilamb
       - name: Run tests
         run: |
           make fetch-test-data
           uv run python scripts/fetch-ilamb-data.py ilamb.txt
-          make test-integration-slow
+          make test
       # Upload the scratch and results directories as artifacts
       - name: Upload scratch artifacts
         uses: actions/upload-artifact@v4

.github/workflows/ci.yaml

@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ "ubuntu-latest" ]
-        python-version: [ "3.10", "3.11", "3.12", "3.13" ]
+        python-version: [ "3.11", "3.12", "3.13" ]
     runs-on: "${{ matrix.os }}"
     defaults:
       run:
@@ -60,7 +60,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ "ubuntu-latest" ]
-        python-version: [ "3.10", "3.11", "3.12",  "3.13" ]
+        python-version: [ "3.11", "3.12",  "3.13" ]
     runs-on: "${{ matrix.os }}"
     steps:
       - name: Check out repository

.github/workflows/deploy.yaml

@@ -36,6 +36,8 @@ jobs:
           version: "0.5.x"
           python-version: "3.12"
       - name: Verify installable
+        # TODO: this step fails we fix https://github.com/Climate-REF/climate-ref/issues/217
+        continue-on-error: true
         run: uv pip install dist/*.whl
       - name: Publish to PyPI
         run: |

.python-version

@@ -1 +1 @@
-3.10
+3.11

Makefile

@@ -108,13 +108,13 @@ test-metrics-pmp:  ## run the tests
 .PHONY: test-integration
 test-integration:  ## run the integration tests
 	uv run \
-		pytest tests -m "not slow" \
+		pytest tests \
 		-r a -v
 
 .PHONY: test-integration-slow
 test-integration-slow:  ## run the integration tests, including the slow tests which may take a while
 	uv run \
-		pytest tests \
+		pytest tests --slow \
 		-r a -v
 
 .PHONY: test-metrics-packages