Merge branch 'main' into index-variables

Author: jsignell

.github/workflows/benchmarks-last-release.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       # We need the full repo to avoid this issue
       # https://github.com/actions/checkout/issues/23
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 

.github/workflows/benchmarks.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
       # We need the full repo to avoid this issue
       # https://github.com/actions/checkout/issues/23
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 

.github/workflows/ci-additional.yaml

@@ -22,10 +22,11 @@ jobs:
     if: |
       github.repository == 'pydata/xarray'
       && (github.event_name == 'push' || github.event_name == 'pull_request')
+      && !contains(github.event.pull_request.labels.*.name, 'skip-ci')
     outputs:
       triggered: ${{ steps.detect-trigger.outputs.trigger-found }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 2
       - uses: xarray-contrib/ci-trigger@v1
@@ -46,7 +47,7 @@ jobs:
       CONDA_ENV_FILE: ci/requirements/environment.yml
       PYTHON_VERSION: "3.12"
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0 # Fetch all history for all branches and tags.
 
@@ -92,7 +93,7 @@ jobs:
       PYTHON_VERSION: "3.12"
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0 # Fetch all history for all branches and tags.
 
@@ -143,7 +144,7 @@ jobs:
       PYTHON_VERSION: "3.11"
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0 # Fetch all history for all branches and tags.
 
@@ -199,7 +200,7 @@ jobs:
       PYTHON_VERSION: "3.12"
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0 # Fetch all history for all branches and tags.
 
@@ -255,7 +256,7 @@ jobs:
       PYTHON_VERSION: "3.11"
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0 # Fetch all history for all branches and tags.
 
@@ -307,7 +308,7 @@ jobs:
       COLUMNS: 120
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0 # Fetch all history for all branches and tags.
 

.github/workflows/ci.yaml

@@ -22,10 +22,11 @@ jobs:
     if: |
       github.repository == 'pydata/xarray'
       && (github.event_name == 'push' || github.event_name == 'pull_request')
+      && !contains(github.event.pull_request.labels.*.name, 'skip-ci')
     outputs:
       triggered: ${{ steps.detect-trigger.outputs.trigger-found }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 2
       - uses: xarray-contrib/ci-trigger@v1
@@ -79,7 +80,7 @@ jobs:
             numprocesses: 1
             os: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0 # Fetch all history for all branches and tags.
       - name: Set environment variables

.github/workflows/hypothesis.yaml

@@ -21,10 +21,11 @@ jobs:
     if: |
       github.repository == 'pydata/xarray'
       && (github.event_name == 'push' || github.event_name == 'pull_request' || github.event_name == 'schedule')
+      && !contains(github.event.pull_request.labels.*.name, 'skip-ci')
     outputs:
       triggered: ${{ steps.detect-trigger.outputs.trigger-found }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 2
       - uses: xarray-contrib/ci-trigger@v1
@@ -52,7 +53,7 @@ jobs:
       PYTHON_VERSION: "3.12"
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0 # Fetch all history for all branches and tags.
 

.github/workflows/nightly-wheels.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'pydata/xarray'
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - uses: actions/setup-python@v6

.github/workflows/pypi-release.yaml

@@ -20,7 +20,7 @@ jobs:
       startsWith(github.ref, 'refs/tags/v')
       ) }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - uses: actions/setup-python@v6

.github/workflows/upstream-dev-ci.yaml

@@ -25,10 +25,11 @@ jobs:
     if: |
       github.repository == 'pydata/xarray'
       && (github.event_name == 'push' || github.event_name == 'pull_request')
+      && !contains(github.event.pull_request.labels.*.name, 'skip-ci')
     outputs:
       triggered: ${{ steps.detect-trigger.outputs.trigger-found }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 2
       - uses: xarray-contrib/ci-trigger@v1
@@ -55,7 +56,7 @@ jobs:
       matrix:
         python-version: ["3.12"]
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0 # Fetch all history for all branches and tags.
       - name: Set up conda environment
@@ -111,7 +112,7 @@ jobs:
       matrix:
         python-version: ["3.11"]
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0 # Fetch all history for all branches and tags.
       - name: Set up conda environment

asv_bench/benchmarks/coarsen.py

@@ -0,0 +1,47 @@
+import numpy as np
+
+import xarray as xr
+
+from . import randn
+
+# Sizes chosen to test padding optimization
+nx_padded = 4003  # Not divisible by 10 - requires padding
+ny_padded = 4007  # Not divisible by 10 - requires padding
+
+nx_exact = 4000  # Divisible by 10 - no padding needed
+ny_exact = 4000  # Divisible by 10 - no padding needed
+
+window = 10
+
+
+class Coarsen:
+    def setup(self, *args, **kwargs):
+        # Case 1: Requires padding on both dimensions
+        self.da_padded = xr.DataArray(
+            randn((nx_padded, ny_padded)),
+            dims=("x", "y"),
+            coords={"x": np.arange(nx_padded), "y": np.arange(ny_padded)},
+        )
+
+        # Case 2: No padding required
+        self.da_exact = xr.DataArray(
+            randn((nx_exact, ny_exact)),
+            dims=("x", "y"),
+            coords={"x": np.arange(nx_exact), "y": np.arange(ny_exact)},
+        )
+
+    def time_coarsen_with_padding(self):
+        """Coarsen 2D array where both dimensions require padding."""
+        self.da_padded.coarsen(x=window, y=window, boundary="pad").mean()
+
+    def time_coarsen_no_padding(self):
+        """Coarsen 2D array where dimensions are exact multiples (no padding)."""
+        self.da_exact.coarsen(x=window, y=window, boundary="pad").mean()
+
+    def peakmem_coarsen_with_padding(self):
+        """Peak memory for coarsening with padding on both dimensions."""
+        self.da_padded.coarsen(x=window, y=window, boundary="pad").mean()
+
+    def peakmem_coarsen_no_padding(self):
+        """Peak memory for coarsening without padding."""
+        self.da_exact.coarsen(x=window, y=window, boundary="pad").mean()

ci/requirements/environment.yml

@@ -37,7 +37,6 @@ dependencies:
   - pre-commit
   - pyarrow # pandas raises a deprecation warning without this, breaking doctests
   - pydap
-  - pydap-server
   - pytest
   - pytest-asyncio
   - pytest-cov