Merge branch 'main' into dtype_fix

* main: (42 commits)
  Update lockfiles and fix for new esmpy (SciTools#342)
  Fix for esmpy (SciTools#353)
  Fix usage of map_blocks (SciTools#338)
  Revert "Updated environment lockfiles (SciTools#335)" (SciTools#341)
  Updated environment lockfiles (SciTools#335)
  Bump actions/cache from 3 to 4 (SciTools#333)
  Bump actions/upload-artifact from 3 to 4 (SciTools#324)
  Bump actions/stale from 8.0.0 to 9.0.0 (SciTools#322)
  fix asv (SciTools#339)
  [pre-commit.ci] pre-commit autoupdate (SciTools#330)
  Bump scitools/workflows from 2023.09.0 to 2024.01.0 (SciTools#334)
  Updated environment lockfiles (SciTools#327)
  [pre-commit.ci] pre-commit autoupdate (SciTools#328)
  Updated environment lockfiles (SciTools#304)
  Add CITATION.cff (SciTools#319)
  updated for enums (SciTools#293)
  Flake8 compliant type checking. (SciTools#316)
  update to v0.10.dev0 (SciTools#314)
  Update to v0.9 (SciTools#313)
  First pass at mesh to mesh (SciTools#311)
  ...

# Conflicts:
#	CHANGELOG.md
#	esmf_regrid/esmf_regridder.py
#	esmf_regrid/schemes.py

.github/workflows/benchmark.yml

@@ -46,7 +46,7 @@ jobs:
 
     steps:
       - name: "checkout"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - if: ${{ github.event_name == 'pull_request' }}
@@ -62,7 +62,7 @@ jobs:
           pip install asv nox
 
       - name: Cache environment directories
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             .nox
@@ -78,7 +78,7 @@ jobs:
           nox --session="benchmarks(branch)" -- "${COMPARE}"
 
       - name: Archive ASV results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: asv-report
           path: |

.github/workflows/ci-citation.yml

@@ -0,0 +1,33 @@
+name: ci-citation
+
+on:
+  pull_request:
+    paths:
+      - "CITATION.cff"
+
+  push:
+    paths:
+      - "CITATION.cff"
+
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  validate:
+    name: "validate"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: "check CITATION.cff"
+        uses: citation-file-format/[email protected]
+        with:
+          args: "--validate"

.github/workflows/ci-manifest.yml

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

.github/workflows/ci-tests.yml

@@ -48,22 +48,22 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest"]
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.10", "3.11", "3.12"]
         include:
-          - python-version: "3.10"
+          - python-version: "3.11"
             coverage: true
 
     steps:
       - name: "checkout"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Nox
         run: |
           pip install nox
 
       - name: Cache environment directories
         id: cache-env-dir
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             .nox
@@ -72,7 +72,7 @@ jobs:
 
       - name: Cache test data directory
         id: cache-test-data
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ${{ env.IRIS_TEST_DATA_PATH }}
@@ -97,3 +97,9 @@ jobs:
           COVERAGE: ${{ matrix.coverage }}
         run: |
           nox --session tests -- --verbose
+
+      - name: Upload coverage report
+        uses: codecov/codecov-action@v4
+        if: ${{ matrix.coverage }}
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/ci-wheels.yml

@@ -34,7 +34,7 @@ jobs:
         shell: bash -l {0}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -46,7 +46,7 @@ jobs:
         run: |
           ls -l ${{ github.workspace }}/dist
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: pypi-artifacts
           path: ${{ github.workspace }}/dist
@@ -67,16 +67,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10"]
+        python-version: ["3.10", "3.11", "3.12"]
         session: ["wheel"]
 
     steps:
       - name: "checkout"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: pypi-artifacts
           path: ${{ github.workspace }}/dist
@@ -87,7 +87,7 @@ jobs:
 
       - name: Cache environment directories
         id: cache-env-dir
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             .nox
@@ -105,7 +105,7 @@ jobs:
     name: "show artifacts"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: pypi-artifacts
           path: ${{ github.workspace }}/dist
@@ -122,7 +122,7 @@ jobs:
     # and check for the SciTools repo
     if: github.event_name == 'push' && github.event.ref == 'refs/heads/main' && github.repository_owner == 'SciTools-incubator'
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: pypi-artifacts
           path: ${{ github.workspace }}/dist
@@ -142,7 +142,7 @@ jobs:
     # upload to PyPI for every tag starting with 'v'
     if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')  && github.repository_owner == 'SciTools-incubator'
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: pypi-artifacts
           path: ${{ github.workspace }}/dist

.github/workflows/refresh-lockfiles.yml

@@ -24,15 +24,15 @@ jobs:
   gen_lockfiles:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: install nox
         run: |
           source $CONDA/bin/activate base
           conda install -y -c conda-forge nox pyyaml
       - name: generate lockfiles
         run: $CONDA/bin/nox --session update_lockfiles
       - name: create pull request
-        uses: peter-evans/create-pull-request@284f54f989303d2699d373481a0cfa13ad5a6666
+        uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38
         with:
           commit-message: Updated environment lockfiles
           delete-branch: true

.github/workflows/stale.yml

@@ -10,11 +10,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/stale@v8.0.0
+    - uses: actions/stale@v9.0.0
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-issue-message: '@SciTools-incubator/esmf-regrid-devs This issue is stale due to a lack of activity in the last 90 days. Remove stale label or comment, otherwise this issue will close automatically in 7 days time.'
-        stale-pr-message: '@SciTools-incubator/esmf-regrid-devs This pull-request is stale due to a lack of activity in the last 90 days. Remove stale label or comment, otherwise this pull-request will close automatically in 7 days time.'
+        stale-issue-message: '@SciTools-incubator/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.'
+        stale-pr-message: '@SciTools-incubator/esmf-regrid-devs This pull-request is stale due to a lack of activity in the last 180 days. Remove stale label or comment, otherwise this pull-request will close automatically in 14 days time.'
         stale-issue-label: 'Stale: Closure warning'
         stale-pr-label: 'Stale: Closure warning'
         close-issue-message: '@SciTools-incubator/esmf-regrid-devs This stale issue has been automatically closed due to no community activity'
@@ -23,5 +23,5 @@ jobs:
         close-pr-label: 'Stale: Closed'
         exempt-issue-labels: 'Status: Blocked,Status: Decision needed,Status: Needs info,Status: Stalled,Status: Will not fix,Status: Work in progress'
         exempt-pr-labels: 'Status: Blocked,Status: Decision needed,Status: Needs info,Status: Stalled,Status: Will not fix,Status: Work in progress'
-        days-before-stale: 90
-        days-before-close: 7
+        days-before-stale: 180
+        days-before-close: 14

.pre-commit-config.yaml

@@ -2,7 +2,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: 'v4.4.0'
+    rev: 'v4.5.0'
     hooks:
         # Prevent giant files from being committed.
     -   id: check-added-large-files
@@ -17,14 +17,14 @@ repos:
         # Don't commit to master branch.
     -   id: no-commit-to-branch
 -   repo: https://github.com/psf/black
-    rev: '23.3.0'
+    rev: '23.12.1'
     hooks:
     -   id: black
         # Force black to run on whole repo, using settings from pyproject.toml
         pass_filenames: false
         args: [--config=./pyproject.toml, .]
 -   repo: https://github.com/PyCQA/flake8
-    rev: '6.0.0'
+    rev: '7.0.0'
     hooks:
         # Run flake8.
     -   id: flake8

CHANGELOG.md

@@ -12,6 +12,33 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
   Ensured dtype is preserved by regridding.
   [@stephenworsley](https://github.com/stephenworsley)
 
+## [0.9] - 2023-11-03
+
+### Added
+
+- [PR#178](https://github.com/SciTools-incubator/iris-esmf-regrid/pull/178)
+  Added support for coordinate systems with non-degree type units.
+  [@stephenworsley](https://github.com/stephenworsley)
+
+- [PR#311](https://github.com/SciTools-incubator/iris-esmf-regrid/pull/311)
+  Added support for Mesh to Mesh regridding.
+  [@HGWright](https://github.com/HGWright)
+
+### Fixed
+
+- [PR#301](https://github.com/SciTools-incubator/iris-esmf-regrid/pull/301)
+  Fixed a bug which caused errors when regridding with the node locations
+  of a mesh whose face_node_connectivity had non-zero start_index.
+  [@stephenworsley](https://github.com/stephenworsley)
+
+## [0.8] - 2023-08-22
+
+### Added
+
+- [PR#289](https://github.com/SciTools-incubator/iris-esmf-regrid/pull/289)
+  Added the ability to regrid onto a Mesh as a target instead of a Cube.
+  [@stephenworsley](https://github.com/stephenworsley)
+
 ## [0.7] - 2023-05-23
 
 ### Added

CITATION.cff

@@ -0,0 +1,12 @@
+cff-version: 1.2.0
+message: "If you use this software, please cite it as below."
+authors:
+- family-names: "Worsley"
+  given-names: "Stephen"
+  orcid: "https://orcid.org/0009-0008-1704-8445"
+title: "iris-esmf-regrid"
+abstract: "A collection of structured and unstructured ESMF regridding schemes for Iris"
+repository-code: "https://github.com/SciTools-incubator/iris-esmf-regrid"
+license: "BSD-3-Clause"
+license-url: "https://spdx.org/licenses/BSD-3-Clause.html"
+type: "software"

MANIFEST.in

@@ -6,9 +6,10 @@ exclude .gitignore
 exclude .pre-commit-config.yaml
 exclude .readthedocs.yml
 include CHANGELOG.md
+include CITATION.cff
 prune benchmarks
 exclude codecov.yml
 prune docs
 recursive-include esmf_regrid *.py *.txt
 exclude noxfile.py
-prune requirements
+prune requirements

README.md

@@ -2,6 +2,7 @@
 
 [![Build Status](https://api.cirrus-ci.com/github/SciTools-incubator/iris-esmf-regrid.svg)](https://cirrus-ci.com/github/SciTools-incubator/iris-esmf-regrid)
 [![Documentation Status](https://readthedocs.org/projects/iris-esmf-regrid/badge/?version=latest)](https://iris-esmf-regrid.readthedocs.io/en/latest/?badge=latest)
+[![ci-citation](https://github.com/SciTools-incubator/iris-esmf-regrid/actions/workflows/ci-citation.yml/badge.svg)](https://github.com/SciTools-incubator/iris-esmf-regrid/actions/workflows/ci-citation.yml)
 [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/SciTools-incubator/iris-esmf-regrid/main.svg)](https://results.pre-commit.ci/latest/github/SciTools-incubator/iris-esmf-regrid/master)
 [![codecov](https://codecov.io/gh/SciTools-incubator/iris-esmf-regrid/branch/main/graph/badge.svg?token=PKBXEHOZFT)](https://codecov.io/gh/SciTools-incubator/iris-esmf-regrid)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)

benchmarks/asv.conf.json

@@ -6,6 +6,10 @@
     "environment_type": "conda-delegated",
     "show_commit_url": "https://github.com/SciTools-incubator/iris-esmf-regrid/commit/",
     "branches": ["upstream/main"],
+    "build_command": [
+        "python setup.py build",
+        "python -mpip wheel --no-deps -w {build_cache_dir} {build_dir}"
+    ],
 
     "benchmark_dir": "./benchmarks",
     "env_dir": ".asv/env",

benchmarks/asv_delegated_conda.py

@@ -114,6 +114,7 @@ def _prep_env(self) -> None:
         message = f"Running delegated environment management for: {self.name}"
         log.info(message)
         env_path = Path(self._path)
+        environ["ESMFMKFILE"] = str(env_path / "lib" / "esmf.mk")
 
         def copy_asv_files(src_parent: Path, dst_parent: Path) -> None:
             """For copying between self._path and a temporary cache."""

benchmarks/benchmarks/generate_data.py

@@ -16,6 +16,7 @@
 from pathlib import Path
 import re
 from subprocess import CalledProcessError, check_output, run
+import sys
 from textwrap import dedent
 from warnings import warn
 
@@ -55,6 +56,8 @@
 #  False forces a benchmark run to re-make all the data files.
 REUSE_DATA = True
 
+ESMFMKFILE = "ESMFMKFILE"
+
 
 def run_function_elsewhere(func_to_run, *args, **kwargs):
     """
@@ -90,9 +93,12 @@ def run_function_elsewhere(func_to_run, *args, **kwargs):
         f"{func_to_run.__name__}(" + ",".join(func_call_term_strings) + ")"
     )
     python_string = "\n".join([func_string, func_call_string])
+    old_esmf_mk_file = environ.get(ESMFMKFILE, None)
+    environ[ESMFMKFILE] = str(Path(sys.executable).parents[1] / "lib" / "esmf.mk")
     result = run(
         [DATA_GEN_PYTHON, "-c", python_string], capture_output=True, check=True
     )
+    environ[ESMFMKFILE] = old_esmf_mk_file
     return result.stdout
 
 

esmf_regrid/__init__.py

@@ -7,7 +7,9 @@
     except ImportError:
         raise exc
 
+# constants needs to be above schemes, as it is used within
+from .constants import Constants, check_method, check_norm
 from .schemes import *
 
 
-__version__ = "0.8.dev0"
+__version__ = "0.10.dev0"