From ebb77df34a22c57c2971e92f51dfe36443d876fc Mon Sep 17 00:00:00 2001 From: Jared Lewis Date: Fri, 26 Sep 2025 13:33:11 +1000 Subject: [PATCH 1/4] chore: Add PMP ENSO datasets --- scripts/fetch_test_data.py | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/scripts/fetch_test_data.py b/scripts/fetch_test_data.py index 74788fc..967134b 100755 --- a/scripts/fetch_test_data.py +++ b/scripts/fetch_test_data.py @@ -485,18 +485,31 @@ def process_sample_data_request( remove_ensembles=False, time_span=("2000", "2025"), ), - # # Obs4MIPs AIRS data - # Obs4MIPsRequest( - # facets=dict( - # project="obs4MIPs", - # institution_id="NASA-JPL", - # frequency="mon", - # source_id="AIRS-2-1", - # variable_id="ta", - # ), - # remove_ensembles=False, - # time_span=("2002", "2016"), - # ), + # PMP ENSO data + CMIP6Request( + id="pmp-enso", + facets=dict( + source_id="ACCESS-ESM1-5", + frequency=["fx", "mon"], + variable_id=[ + "areacella", + "sftlf", + "ts", + "tauu", + "taux", + "hfls", + "hfss", + "rlds", + "rlus", + "rsds", + "rsus", + ], + experiment_id=["historical"], + variant_label=["r1i1p1f1"], + ), + remove_ensembles=False, + time_span=("2000", "2025"), + ), # All unpublished obs4mips datasets Obs4REFRequest(), ] From 95f5f3d6290d61167bd2c30c4ad975dd802108cb Mon Sep 17 00:00:00 2001 From: Jared Lewis Date: Fri, 26 Sep 2025 13:34:33 +1000 Subject: [PATCH 2/4] chore: Changelog --- changelog/51.improvement.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/51.improvement.md diff --git a/changelog/51.improvement.md b/changelog/51.improvement.md new file mode 100644 index 0000000..ba82152 --- /dev/null +++ b/changelog/51.improvement.md @@ -0,0 +1 @@ +Ensure that the required files for the PMP ENSO diagnostics are available From 1c26c554a569b2ea92ba232f770f4df93a8f7e44 Mon Sep 17 00:00:00 2001 From: Jared Lewis Date: Fri, 26 Sep 2025 14:40:17 +1000 Subject: [PATCH 3/4] chore: don't cache the pixi install --- .github/actions/setup/action.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 7a21608..9b0d32d 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -6,8 +6,7 @@ runs: - name: Install pixi uses: prefix-dev/setup-pixi@v0.8.11 with: - pixi-version: "v0.49.0" - cache: true - # Frozen is needed as the ref git dependency was not playing nice with a fully locked environment - frozen: true + pixi-version: "v0.54.0" + cache: false # The self-hosted runners have a local cache + locked: true log-level: "v" From 79f3d9a9419a2ec34423b9fff3cfec94284960db Mon Sep 17 00:00:00 2001 From: Jared Lewis Date: Tue, 30 Sep 2025 14:33:28 +1000 Subject: [PATCH 4/4] chore: Use temp location for pixi --- .github/actions/setup/action.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 9b0d32d..62e46d1 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -4,9 +4,11 @@ runs: using: "composite" steps: - name: Install pixi - uses: prefix-dev/setup-pixi@v0.8.11 + uses: prefix-dev/setup-pixi@v0.9.1 with: pixi-version: "v0.54.0" cache: false # The self-hosted runners have a local cache locked: true log-level: "v" + post-cleanup: true + pixi-bin-path: ${{ runner.temp }}/bin/pixi