Fix for esmpy (SciTools#353)

* fix node/element indexing to work with latest esmpy

* fix for codecov

* add coverage code back to nox

* add coverage code back to nox

* add coverage code back to nox don't test 3.9

* remove python 3.9

* remove codecov from nox again

* remove python 3.9 references

.github/workflows/ci-tests.yml

@@ -48,7 +48,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest"]
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.10", "3.11"]
         include:
           - python-version: "3.10"
             coverage: true
@@ -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

@@ -67,7 +67,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10"]
+        python-version: ["3.10"]
         session: ["wheel"]
 
     steps:

esmf_regrid/experimental/unstructured_regrid.py

@@ -75,19 +75,17 @@ def __init__(
         if location == "face":
             field_kwargs = {"meshloc": esmpy.MeshLoc.ELEMENT}
             shape = (len(face_node_connectivity),)
-            index_offset = self.esi
         elif location == "node":
             field_kwargs = {"meshloc": esmpy.MeshLoc.NODE}
             shape = (len(node_coords),)
-            index_offset = self.nsi
         else:
             raise ValueError(
                 f"The mesh location '{location}' is not supported, only "
                 f"'face' and 'node' are supported."
             )
         super().__init__(
             shape=shape,
-            index_offset=index_offset,
+            index_offset=1,
             field_kwargs=field_kwargs,
             mask=mask,
         )
@@ -97,10 +95,10 @@ def _as_esmf_info(self):
         # the data must be translated into a form ESMF understands
         num_node = self.node_coords.shape[0]
         num_elem = self.fnc.shape[0]
-        nodeId = np.array(range(self.nsi, self.nsi + num_node))
+        nodeId = np.arange(1, num_node + 1)
         nodeCoord = self.node_coords.flatten()
         nodeOwner = np.zeros([num_node])  # regridding currently serial
-        elemId = np.array(range(self.esi, self.esi + num_elem))
+        elemId = np.arange(1, num_elem + 1)
         elemType = self.fnc.count(axis=1)
         # Experiments seem to indicate that ESMF is using 0 indexing here
         elemConn = self.fnc.compressed() - self.nsi

noxfile.py

@@ -26,7 +26,7 @@
 PACKAGE = "esmf_regrid"
 
 #: GHA-CI environment variable hook.
-PY_VER = os.environ.get("PY_VER", ["3.9", "3.10", "3.11"])
+PY_VER = os.environ.get("PY_VER", ["3.10", "3.11"])
 
 #: GHA-CI environment variable hook.
 COVERAGE = os.environ.get("COVERAGE", False)
@@ -308,7 +308,6 @@ def tests(session: nox.sessions.Session):
     if COVERAGE:
         # Execute the tests with code coverage.
         session.run("pytest", "--cov-report=xml", "--cov")
-        session.run("codecov", "--required")
     else:
         # Execute the tests.
         session.run("pytest")

pyproject.toml

@@ -18,7 +18,6 @@ classifiers = [
     "Natural Language :: English",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Topic :: Scientific/Engineering :: Atmospheric Science",
@@ -36,7 +35,7 @@ keywords = [
 ]
 license = {text = "BSD-3-Clause"}
 name = "esmf_regrid"
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 
 [project.urls]
 Code = "https://github.com/SciTools-incubator/iris-esmf-regrid"
@@ -45,7 +44,7 @@ Issues = "https://github.com/SciTools-incubator/iris-esmf-regrid/issues"
 
 [tool.black]
 line-length = 88
-target-version = ['py39', 'py310', 'py311']
+target-version = ['py310', 'py311']
 include = '\.pyi?$'
 
 [tool.pytest.ini_options]