Merge branch 'main' into CPU_COUNT

crusaderky · web-flow · commit 59dab320f45e · 2026-01-28T15:41:56.000Z
diff --git a/.github/workflows/additional.yml b/.github/workflows/additional.yml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Setup Conda Environment
-        uses: conda-incubator/setup-miniconda@v3.2.0
+        uses: conda-incubator/setup-miniconda@v3.3.0
         with:
           miniforge-version: latest
           use-mamba: true
diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
@@ -32,7 +32,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Set up Python
-        uses: conda-incubator/setup-miniconda@v3.2.0
+        uses: conda-incubator/setup-miniconda@v3.3.0
         with:
           miniforge-version: latest
           use-mamba: true
diff --git a/.github/workflows/test-report.yaml b/.github/workflows/test-report.yaml
@@ -26,7 +26,7 @@ jobs:
           repository: dask/distributed
 
       - name: Setup Conda Environment
-        uses: conda-incubator/setup-miniconda@v3.2.0
+        uses: conda-incubator/setup-miniconda@v3.3.0
         with:
           miniforge-version: latest
           condarc-file: continuous_integration/condarc
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -78,7 +78,7 @@ jobs:
           java-version: "11"
 
       - name: Setup Conda Environment
-        uses: conda-incubator/setup-miniconda@v3.2.0
+        uses: conda-incubator/setup-miniconda@v3.3.0
         with:
           miniforge-version: latest
           use-mamba: true
diff --git a/.github/workflows/upstream.yml b/.github/workflows/upstream.yml
@@ -45,7 +45,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Setup Conda Environment
-        uses: conda-incubator/setup-miniconda@v3.2.0
+        uses: conda-incubator/setup-miniconda@v3.3.0
         with:
           miniforge-version: latest
           use-mamba: true
diff --git a/dask/array/tests/test_xarray.py b/dask/array/tests/test_xarray.py
@@ -91,6 +91,8 @@ def test_positional_indexer_multiple_variables():
 
 @pytest.mark.parametrize("compute", [True, False])
 def test_xarray_blockwise_fusion_store(compute):
+    pytest.importorskip("zarr")
+
     def custom_scheduler_get(dsk, keys, expected, **kwargs):
         dsk = dsk.__dask_graph__()
         assert (
