climate-ref-pmp 0.6.5__py3-none-any.whl → 0.7.0__py3-none-any.whl

climate_ref_pmp/__init__.py

@@ -2,17 +2,45 @@
 Rapid evaluating CMIP data
 """
 
+from __future__ import annotations
+
 import importlib.metadata
+import os
+from typing import TYPE_CHECKING
+
+from loguru import logger
 
 from climate_ref_core.dataset_registry import DATASET_URL, dataset_registry_manager
 from climate_ref_core.providers import CondaDiagnosticProvider
 from climate_ref_pmp.diagnostics import ENSO, AnnualCycle, ExtratropicalModesOfVariability
 
+if TYPE_CHECKING:
+    from climate_ref.config import Config
+
 __version__ = importlib.metadata.version("climate-ref-pmp")
 
+
 # Create the PMP diagnostics provider
 # PMP uses a conda environment to run the diagnostics
-provider = CondaDiagnosticProvider("PMP", __version__)
+class PMPDiagnosticProvider(CondaDiagnosticProvider):
+    """
+    Provider for PMP diagnostics.
+    """
+
+    def configure(self, config: Config) -> None:
+        """Configure the provider."""
+        super().configure(config)
+        self.env_vars["PCMDI_CONDA_EXE"] = str(self.get_conda_exe())
+        # This is a workaround for a fatal error in internal_Finalize of MPICH
+        # when running in a conda environment on MacOS.
+        # It is not clear if this is a bug in MPICH or a problem with the conda environment.
+        if "FI_PROVIDER" not in os.environ:  # pragma: no branch
+            logger.debug("Setting env variable 'FI_PROVIDER=tcp'")
+            self.env_vars["FI_PROVIDER"] = "tcp"
+
+
+provider = PMPDiagnosticProvider("PMP", __version__)
+
 
 # Annual cycle diagnostics and metrics
 provider.register(AnnualCycle())

climate_ref_pmp/diagnostics/variability_modes.py

@@ -1,3 +1,4 @@
+import json
 from collections.abc import Iterable
 from pathlib import Path
 from typing import Any, Union
@@ -215,8 +216,6 @@ def clean_up_json(json_file: Union[str, Path]) -> None:
     json_file : str or Path
         Path to the JSON file to clean up.
     """
-    import json
-
     with open(str(json_file)) as f:
         data = json.load(f)
 

climate_ref_pmp/pmp_driver.py

@@ -159,13 +159,6 @@ def build_pmp_command(
     # Note this uses the driver script from the REF env *not* the PMP conda env
     _parameter_file = _get_resource("climate_ref_pmp.params", parameter_file, use_resources=True)
 
-    # This is a workaround for a fatal error in internal_Finalize of MPICH
-    # when running in a conda environment on MacOS.
-    # It is not clear if this is a bug in MPICH or a problem with the conda environment.
-    if "FI_PROVIDER" not in os.environ:  # pragma: no branch
-        logger.debug("Setting env variable 'FI_PROVIDER=tcp'")
-        os.environ["FI_PROVIDER"] = "tcp"
-
     # Run the driver script inside the PMP conda environment
     cmd = [
         driver_file,