back out to v8.8.1 of ESMF

Author: jedwards4b

.github/workflows/pylint.yml

@@ -75,7 +75,7 @@ jobs:
           ESMF_NETCDF: nc-config
           ESMF_INSTALL_PREFIX: $HOME/ESMF
         with:
-          version: latest
+          version: v8.8.1
           esmpy: true
       - name: Show ESMF info
         run: |

cmip7_prep/cmor_writer.py

@@ -7,7 +7,7 @@
 `cmor_dataset.json` living under `cmip7_prep/data/`.
 """
 
-from contextlib import AbstractContextManager
+from contextlib import AbstractContextManager, contextmanager
 from pathlib import Path
 import re
 from importlib.resources import files as ir_files, as_file
@@ -23,6 +23,26 @@
 _UUID_RE = re.compile(r"^[0-9a-f\-]{36}$", re.IGNORECASE)
 
 
+@contextmanager
+def _as_path_cm(obj):
+    """
+    Yield a Path whether `obj` is already a path-like or a context manager
+    (e.g., importlib.resources.as_file(...)).
+    """
+    # already a path-like → no-op context
+    if isinstance(obj, (str, Path)):
+        yield Path(obj)
+        return
+
+    # context manager that yields a path-like
+    if hasattr(obj, "__enter__") and hasattr(obj, "__exit__"):
+        with obj as p:
+            yield Path(p)
+        return
+
+    raise TypeError(f"Unsupported dataset_json object type: {type(obj)!r}")
+
+
 # ---------------------------------------------------------------------
 # Packaged resource helpers
 # ---------------------------------------------------------------------