climate-ref-ilamb 0.5.2__tar.gz → 0.5.3__tar.gz

{climate_ref_ilamb-0.5.2 → climate_ref_ilamb-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: climate-ref-ilamb
-Version: 0.5.2
+Version: 0.5.3
 Summary: ILAMB diagnostic provider for the Rapid Evaluation Framework
 Author-email: Nathan Collier <nathaniel.collier@gmail.com>
 License: Apache-2.0

{climate_ref_ilamb-0.5.2 → climate_ref_ilamb-0.5.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "climate-ref-ilamb"
-version = "0.5.2"
+version = "0.5.3"
 description = "ILAMB diagnostic provider for the Rapid Evaluation Framework"
 readme = "README.md"
 authors = [{ name = "Nathan Collier", email = "nathaniel.collier@gmail.com" }]

{climate_ref_ilamb-0.5.2 → climate_ref_ilamb-0.5.3}/src/climate_ref_ilamb/standard.py

@@ -25,7 +25,7 @@ from climate_ref_ilamb.datasets import (
 
 def _build_cmec_bundle(name: str, df: pd.DataFrame) -> dict[str, Any]:
     """
-    Build a CMEC boundle from information in the dataframe.
+    Build a CMEC bundle from information in the dataframe.
 
     TODO: Migrate to use pycmec when ready.
     TODO: Add plots and html output.
@@ -169,7 +169,7 @@ class ILAMBStandard(Diagnostic):
             dataset_registry_manager[self.registry_file],
         )
 
-    def run(self, definition: ExecutionDefinition) -> ExecutionResult:
+    def execute(self, definition: ExecutionDefinition) -> None:
         """
         Run the ILAMB standard analysis.
         """
@@ -183,8 +183,25 @@ class ILAMBStandard(Diagnostic):
             definition.output_directory,
             **self.ilamb_kwargs,
         )
+
+    def build_execution_result(self, definition: ExecutionDefinition) -> ExecutionResult:
+        """
+        Build the diagnostic result after running ILAMB.
+
+        Parameters
+        ----------
+        definition
+            The definition of the diagnostic execution
+
+        Returns
+        -------
+            An execution result object
+        """
+        _set_ilamb3_options(self.registry, self.registry_file)
+
         df = _load_csv_and_merge(definition.output_directory)
         metric_bundle, output_bundle = _form_bundles(definition.key, df)
+
         return ExecutionResult.build_from_output_bundle(
             definition, cmec_output_bundle=output_bundle, cmec_metric_bundle=metric_bundle
         )

climate_ref_ilamb-0.5.3/tests/integration/test_diagnostics.py

@@ -0,0 +1,37 @@
+import pytest
+from climate_ref_ilamb import provider as ilamb_provider
+
+from climate_ref_core.diagnostics import Diagnostic
+
+skipped_diagnostics = [
+    "csoil-hwsd2",  # Incorrect time spans
+    "nbp-hoffman",  # Incorrect time spans
+]
+
+diagnostics = [
+    pytest.param(
+        diagnostic,
+        id=diagnostic.slug,
+        marks=[pytest.mark.xfail(reason="Expected failure")]
+        if diagnostic.slug in skipped_diagnostics
+        else [],
+    )
+    for diagnostic in ilamb_provider.diagnostics()
+]
+
+
+@pytest.mark.slow
+@pytest.mark.parametrize("diagnostic", diagnostics)
+def test_diagnostics(diagnostic: Diagnostic, diagnostic_validation):
+    validator = diagnostic_validation(diagnostic)
+
+    definition = validator.get_definition()
+    validator.execute(definition)
+
+
+@pytest.mark.parametrize("diagnostic", diagnostics)
+def test_build_results(diagnostic: Diagnostic, diagnostic_validation):
+    validator = diagnostic_validation(diagnostic)
+
+    definition = validator.get_regression_definition()
+    validator.validate(definition)

climate_ref_ilamb-0.5.2/tests/integration/test_diagnostics.py

@@ -1,15 +0,0 @@
-import pytest
-from climate_ref_ilamb import provider as ilamb_provider
-
-from climate_ref_core.diagnostics import Diagnostic
-
-diagnostics = [pytest.param(diagnostic, id=diagnostic.slug) for diagnostic in ilamb_provider.diagnostics()]
-
-
-@pytest.mark.slow
-@pytest.mark.parametrize("diagnostic", diagnostics)
-def test_diagnostics(diagnostic: Diagnostic, diagnostic_validation):
-    if diagnostic.slug.startswith("thetao"):
-        pytest.xfail("Missing data for thetao diagnostics")
-
-    diagnostic_validation(diagnostic)