From 1718e92b68b947c8131dae4534920c25e6ee3e93 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Fri, 14 Feb 2025 12:53:31 +0000 Subject: [PATCH 1/5] test with dask 2025.2 --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index b793092e50..2c712ec3f9 100644 --- a/environment.yml +++ b/environment.yml @@ -8,7 +8,7 @@ dependencies: - cartopy - cf-units - cftime - - dask >=2025 # github.com/ESMValGroup/ESMValCore/issues/2503 + - dask >=2025.2 # test:catch new bugs # github.com/ESMValGroup/ESMValCore/issues/2503 - dask-jobqueue - distributed - esgf-pyclient >=0.3.1 From 1109a9cc8c5a67542d49a2cca5a33a15fef58d78 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Fri, 14 Feb 2025 12:53:43 +0000 Subject: [PATCH 2/5] run GHA --- .github/workflows/run-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 54bd7a746d..b1537c034d 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -21,6 +21,7 @@ on: push: branches: - main + - dask_2025.2 # run the test only if the PR is to main # turn it on if required #pull_request: From c355c36ee48a871ff71ca1f461114893ba3fd29e Mon Sep 17 00:00:00 2001 From: Manuel Schlund Date: Mon, 17 Feb 2025 13:27:36 +0100 Subject: [PATCH 3/5] Restored original environment files --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 2c712ec3f9..b793092e50 100644 --- a/environment.yml +++ b/environment.yml @@ -8,7 +8,7 @@ dependencies: - cartopy - cf-units - cftime - - dask >=2025.2 # test:catch new bugs # github.com/ESMValGroup/ESMValCore/issues/2503 + - dask >=2025 # github.com/ESMValGroup/ESMValCore/issues/2503 - dask-jobqueue - distributed - esgf-pyclient >=0.3.1 From 04c8d9c1df87949395438517baafaaa5a6803add Mon Sep 17 00:00:00 2001 From: Manuel Schlund Date: Mon, 17 Feb 2025 13:29:41 +0100 Subject: [PATCH 4/5] Fix dask test --- tests/unit/preprocessor/test_shared.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/preprocessor/test_shared.py b/tests/unit/preprocessor/test_shared.py index ac01d9ca7d..20179ea25b 100644 --- a/tests/unit/preprocessor/test_shared.py +++ b/tests/unit/preprocessor/test_shared.py @@ -440,7 +440,7 @@ def test_try_adding_calculated_cell_area(): np.ma.masked_array(np.arange(2), mask=[1, 0]), da.arange(2), (0,), - da.ma.masked_array(np.ones(2), np.arange(2)), + da.ma.masked_array(np.arange(2), np.ones(2)), ), ( np.ones((2, 5)), From c3561d70c77958e4b07bfdb90c359cf2c690b302 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Mon, 17 Feb 2025 13:18:07 +0000 Subject: [PATCH 5/5] Update .github/workflows/run-tests.yml --- .github/workflows/run-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index b1537c034d..54bd7a746d 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -21,7 +21,6 @@ on: push: branches: - main - - dask_2025.2 # run the test only if the PR is to main # turn it on if required #pull_request: