Merge branch 'main' into ruff-tidy

* main: (25 commits)
  update to version 0.12.1 (SciTools#494)
  chore: update pre-commit hooks (SciTools#441)
  Updated environment lockfiles (SciTools#483)
  Bump scitools/workflows from 2025.03.3 to 2025.04.0 (SciTools#493)
  Backwards compatible loading (SciTools#479)
  Add `benchmarks/custom_bms` from template (SciTools#488)
  Add ci-template-check.yml. (SciTools#484)
  Fix accepted esmf_args (SciTools#486)
  update to version 0.13.dev0 (SciTools#477)
  update to version 0.12.0 (SciTools#476)
  Bump codecov/codecov-action from 4 to 5 (SciTools#436)
  Bump scitools/workflows from 2025.03.2 to 2025.03.3 (SciTools#472)
  Updated environment lockfiles (SciTools#467)
  Allow ESMF arguments to be passed (SciTools#396)
  Bump scitools/workflows from 2025.03.1 to 2025.03.2 (SciTools#471)
  Bump peter-evans/create-pull-request from 7.0.6 to 7.0.8 (SciTools#469)
  Bump scitools/workflows from 2025.02.2 to 2025.03.1 (SciTools#470)
  fix precomputed regridder save bug (SciTools#462)
  Add python 3.13 support, drop 3.10 (SciTools#464)
  Bump scitools/workflows from 2025.01.5 to 2025.02.2 (SciTools#463)
  ...

# Conflicts:
#	esmf_regrid/esmf_regridder.py
#	esmf_regrid/experimental/io.py

Author: stephenworsley

.github/workflows/benchmark.yml

@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      PY_VER: "3.10"
+      PY_VER: "3.12"
       IRIS_TEST_DATA_LOC_PATH: benchmarks
       IRIS_TEST_DATA_PATH: benchmarks/iris-test-data
       IRIS_TEST_DATA_VERSION: "2.19"
@@ -42,7 +42,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["3.10"]
+        python-version: ["3.12"]
 
     steps:
       - name: "checkout"
@@ -68,7 +68,7 @@ jobs:
             .nox
             benchmarks/.asv/env
             $CONDA/pkgs
-          key: ${{ runner.os }}-${{ hashFiles('requirements/') }}-${{ env.ENV_CACHE_BUILD }}-${{ env.IRIS_SOURCE }}
+          key: ${{ runner.os }}-${{ hashFiles('requirements/locks/') }}-${{ env.ENV_CACHE_BUILD }}-${{ env.IRIS_SOURCE }}
 
       - name: Benchmark script
         run: |

.github/workflows/ci-manifest.yml

@@ -20,4 +20,4 @@ concurrency:
 jobs:
   manifest:
     name: "check-manifest"
-    uses: scitools/workflows/.github/workflows/ci-manifest.yml@2024.10.3
+    uses: scitools/workflows/.github/workflows/ci-manifest.yml@2025.04.0

.github/workflows/ci-template-check.yml

@@ -0,0 +1,16 @@
+# Checks if a PR makes any changes that ought to be shared via templating.
+# See the called workflow in the scitools/workflows repo for more details.
+
+name: ci-template-check
+
+on:
+  pull_request_target:
+    branches:
+      - main
+
+jobs:
+  prompt-share:
+    uses: scitools/workflows/.github/workflows/ci-template-check.yml@2025.04.0
+    secrets: inherit
+    with:
+      pr_number: ${{ github.event.pull_request.number }}

.github/workflows/ci-tests.yml

@@ -48,7 +48,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest"]
-        python-version: ["3.10", "3.11", "3.12"]
+        python-version: ["3.11", "3.12", "3.13"]
         include:
           - python-version: "3.11"
             coverage: true
@@ -68,7 +68,7 @@ jobs:
           path: |
             .nox
             $CONDA/pkgs
-          key: ${{ runner.os }}-${{ hashFiles('requirements/') }}-${{ env.ENV_CACHE_BUILD }}-${{ env.IRIS_SOURCE }}-${{ matrix.python-version }}
+          key: ${{ runner.os }}-${{ hashFiles('requirements/locks/') }}-${{ env.ENV_CACHE_BUILD }}-${{ env.IRIS_SOURCE }}-${{ matrix.python-version }}
 
       - name: Cache test data directory
         id: cache-test-data
@@ -99,7 +99,7 @@ jobs:
           nox --session tests -- --verbose
 
       - name: Upload coverage report
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         if: ${{ matrix.coverage }}
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/ci-wheels.yml

@@ -67,7 +67,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.10", "3.11", "3.12"]
+        python-version: ["3.11", "3.12", "3.13"]
         session: ["wheel"]
 
     steps:
@@ -92,7 +92,7 @@ jobs:
           path: |
             .nox
             $CONDA/pkgs
-          key: ${{ runner.os }}-${{ hashFiles('requirements/') }}-${{ env.ENV_CACHE_BUILD }}-${{ env.IRIS_SOURCE }}-${{ matrix.python-version }}
+          key: ${{ runner.os }}-${{ hashFiles('requirements/locks/') }}-${{ env.ENV_CACHE_BUILD }}-${{ env.IRIS_SOURCE }}-${{ matrix.python-version }}
 
       - name: "nox install and test wheel"
         env:

.github/workflows/refresh-lockfiles.yml

@@ -42,7 +42,7 @@ jobs:
           private_key: ${{ secrets.AUTH_APP_PRIVATE_KEY }}
 
       - name: create pull request
-        uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
+        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e
         with:
           token: ${{ steps.generate-token.outputs.token }}
           commit-message: Updated environment lockfiles

.github/workflows/stale.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/stale@v9.0.0
+    - uses: actions/stale@v9.1.0
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: '@SciTools/esmf-regrid-devs This issue is stale due to a lack of activity in the last 180 days. Remove stale label or comment, otherwise this issue will close automatically in 14 days time.'

.pre-commit-config.yaml

@@ -51,7 +51,7 @@ repos:
     -   id: trailing-whitespace
 
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.4.4"
+    rev: "v0.11.4"
     hooks:
     -   id: ruff
         types: [file, python]
@@ -60,45 +60,45 @@ repos:
         types: [file, python]
 
 -   repo: https://github.com/codespell-project/codespell
-    rev: "v2.2.6"
+    rev: "v2.4.1"
     hooks:
     -   id: codespell
         types_or: [asciidoc, python, markdown, rst]
         additional_dependencies: [tomli]
 
 -   repo: https://github.com/adamchainz/blacken-docs
-    rev: 1.16.0
+    rev: 1.19.1
     hooks:
     -   id: blacken-docs
         types: [file, rst]
 
 -   repo: https://github.com/aio-libs/sort-all
-    rev: v1.2.0
+    rev: v1.3.0
     hooks:
     -   id: sort-all
         types: [file, python]
 
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: 'v1.10.0'
+    rev: 'v1.15.0'
     hooks:
     -   id: mypy
         exclude: 'noxfile\.py|docs/src/conf\.py|^benchmarks'
 
 -   repo: https://github.com/abravalheri/validate-pyproject
     # More exhaustive than Ruff RUF200.
-    rev: "v0.18"
+    rev: "v0.24.1"
     hooks:
     - id: validate-pyproject
 
 -   repo: https://github.com/scientific-python/cookie
-    rev: 2024.04.23
+    rev: 2025.01.22
     hooks:
     - id: sp-repo-review
       additional_dependencies: ["repo-review[cli]"]
       args: ["--show=errskip"]
 
 -   repo: https://github.com/numpy/numpydoc
-    rev: v1.7.0
+    rev: v1.8.0
     hooks:
       - id: numpydoc-validation
         types: [file, python]

CHANGELOG.md

@@ -6,6 +6,40 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 
+## [0.12.1] - 2025-04-09
+
+### Fixed
+
+- [PR#486](https://github.com/SciTools/iris-esmf-regrid/pull/486)
+  Fixed bug causing the esmf argument `pole_method` to be rejected.
+  [@stephenworsley](https://github.com/stephenworsley)
+
+- [PR#479](https://github.com/SciTools/iris-esmf-regrid/pull/479)
+  Fixed bug which caused loading to be backwards incompatible.
+  [@stephenworsley](https://github.com/stephenworsley)
+
+## [0.12] - 2025-03-17
+
+### Fixed
+
+- [PR#462](https://github.com/SciTools/iris-esmf-regrid/pull/462)
+  Fixed bug when saving regridders made with precomputed weights.
+  [@stephenworsley](https://github.com/stephenworsley)
+
+### Added
+
+- [PR#464](https://github.com/SciTools/iris-esmf-regrid/pull/464)
+  Add support for Python 3.13.
+  [@stephenworsley](https://github.com/stephenworsley)
+- [PR#396](https://github.com/SciTools/iris-esmf-regrid/pull/396)
+  Added controls for passing arguments to ESMF.
+  [@stephenworsley](https://github.com/stephenworsley)
+
+### Removed
+
+- [PR#464](https://github.com/SciTools/iris-esmf-regrid/pull/464)
+  Remove support for Python 3.10.
+  [@stephenworsley](https://github.com/stephenworsley)
 
 ## [0.11] - 2024-07-31
 

MANIFEST.in

@@ -11,5 +11,6 @@ prune benchmarks
 exclude codecov.yml
 prune docs
 recursive-include esmf_regrid *.py *.txt
+recursive-exclude esmf_regrid *.nc
 exclude noxfile.py
 prune requirements