Add Lafferty and Sriver partition

.github/workflows/main.yml

@@ -20,7 +20,7 @@ on:
       - submitted
 
 env:
-  XCLIM_TESTDATA_BRANCH: v2023.12.14
+  XCLIM_TESTDATA_BRANCH: v2023.12.24
 
 concurrency:
   # For a given workflow, if we push to the same branch, cancel all previous builds on that branch except on master.

tests/conftest.py

@@ -24,6 +24,7 @@
 from xclim.testing import helpers
 from xclim.testing.helpers import test_timeseries
 from xclim.testing.utils import _default_cache_dir  # noqa
+from xclim.testing.utils import get_file
 from xclim.testing.utils import open_dataset as _open_dataset
 
 if not __xclim_version__.endswith("-beta") and helpers.TESTDATA_BRANCH == "main":
@@ -429,6 +430,24 @@ def ensemble_dataset_objects() -> dict:
     return edo
 
 
+@pytest.fixture(scope="session")
+def lafferty_sriver_ds() -> xr.Dataset:
+    import pandas as pd
+
+    # Get data from Lafferty & Sriver unit test
+    # https://github.com/david0811/lafferty-sriver_2023_npjCliAtm/tree/main/unit_test
+    fn = get_file("uncertainty_partitioning/seattle_avg_tas.csv")
+
+    df = pd.read_csv(fn, parse_dates=["time"]).rename(
+        columns={"ssp": "scenario", "ensemble": "downscaling"}
+    )
+
+    # Make xarray dataset
+    return xr.Dataset.from_dataframe(
+        df.set_index(["scenario", "model", "downscaling", "time"])
+    )
+
+
 @pytest.fixture(scope="session", autouse=True)
 def gather_session_data(threadsafe_data_dir, worker_id, xdoctest_namespace):
     """Gather testing data on pytest run.

tests/test_partitioning.py

@@ -108,22 +108,9 @@ def test_lafferty_sriver_synthetic(random):
     lafferty_sriver(da, sm=sm)
 
 
-def test_lafferty_sriver():
-    import pandas as pd
+def test_lafferty_sriver(lafferty_sriver_ds):
+    g, u = lafferty_sriver(lafferty_sriver_ds.tas)
 
-    # Get data from Lafferty & Sriver unit test
-    # https://github.com/david0811/lafferty-sriver_2023_npjCliAtm/tree/main/unit_test
-    fn = get_file("uncertainty_partitioning/seattle_avg_tas.csv")
-
-    df = pd.read_csv(fn, parse_dates=["time"]).rename(
-        columns={"ssp": "scenario", "ensemble": "downscaling"}
-    )
-
-    # Make xarray dataset
-    ds = xr.Dataset.from_dataframe(
-        df.set_index(["scenario", "model", "downscaling", "time"])
-    )
-    g, u = lafferty_sriver(ds.tas)
     fu = fractional_uncertainty(u)
 
     # Assertions based on expected results from

xclim/testing/utils.py

@@ -80,7 +80,7 @@ def file_md5_checksum(f_name):
 def get_file(
     name: str | os.PathLike | Sequence[str | os.PathLike],
     github_url: str = "https://github.com/Ouranosinc/xclim-testdata",
-    branch: str = "master",
+    branch: str = "main",
     cache_dir: Path = _default_cache_dir,
 ) -> Path | list[Path]:
     """Return a file from an online GitHub-like repository.