Update lockfiles and fix for new esmpy (#342)

* fix for new esmpy

* alternate fix for esmpy 8.6

* upgrade python versions

* upgrade python versions for wheel ci

* alternate approach for coverage

* try codecov v3

* add token to codecov action

* pin conda for asv

* fix conda for asv

* fix conda for asv

* back out conda actions

* pin conda for benchmarks

* fix conda for benchmarks

* fix ESMFMKFILE for benchmarks

.github/workflows/ci-tests.yml

@@ -48,9 +48,9 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest"]
-        python-version: ["3.10", "3.11"]
+        python-version: ["3.10", "3.11", "3.12"]
         include:
-          - python-version: "3.10"
+          - python-version: "3.11"
             coverage: true
 
     steps:

.github/workflows/ci-wheels.yml

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

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
 
 

noxfile.py

@@ -26,7 +26,7 @@
 PACKAGE = "esmf_regrid"
 
 #: GHA-CI environment variable hook.
-PY_VER = os.environ.get("PY_VER", ["3.10", "3.11"])
+PY_VER = os.environ.get("PY_VER", ["3.10", "3.11", "3.12"])
 
 #: GHA-CI environment variable hook.
 COVERAGE = os.environ.get("COVERAGE", False)
@@ -370,6 +370,7 @@ def benchmarks(
     COMPARE_FACTOR = 2.0
 
     session.install("asv", "nox", "pyyaml")
+    session.run("conda", "install", "--yes", "conda<24.3")
 
     data_gen_var = "DATA_GEN_PYTHON"
     if data_gen_var in os.environ:
@@ -391,8 +392,6 @@ def benchmarks(
             Path(".nox").rglob(f"tests*/bin/python{PY_VER}")
         ).resolve()
         session.env[data_gen_var] = data_gen_python
-    esmf_mk_file = data_gen_python.parents[1] / "lib" / "esmf.mk"
-    session.env[ESMFMKFILE] = esmf_mk_file
 
     print("Running ASV...")
     session.cd("benchmarks")

pyproject.toml

@@ -20,6 +20,7 @@ classifiers = [
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Topic :: Scientific/Engineering :: Atmospheric Science",
 ]
 description = "Iris regridding scheme using ESMF"
@@ -44,7 +45,7 @@ Issues = "https://github.com/SciTools-incubator/iris-esmf-regrid/issues"
 
 [tool.black]
 line-length = 88
-target-version = ['py310', 'py311']
+target-version = ['py310', 'py311', 'py312']
 include = '\.pyi?$'
 
 [tool.pytest.ini_options]

requirements/py312.yml

@@ -0,0 +1,32 @@
+name: esmf-regrid-dev
+
+channels:
+  - conda-forge
+
+dependencies:
+  - python=3.12
+
+# Setup dependencies.
+  - setuptools>=40.8.0
+
+# Core dependencies.
+  - cartopy>=0.18
+  - numpy>=1.14
+  - scipy
+  - esmpy>=7.0
+  - iris
+  - cf-units
+
+# Test dependencies.
+  - asv
+  - codecov
+  - nox
+  - pre-commit
+  - pytest
+  - pytest-cov
+
+# Docs dependencies.
+  - pydata-sphinx-theme
+  - sphinx
+  - sphinx-copybutton
+  - sphinxcontrib-apidoc