Merge branch 'main' into concat_default_kwargs

* main: (94 commits)
  Restructure API documentation into organized sections (pydata#10540)
  Fix convert calendar with different dimension name (pydata#10544)
  Fix kerchunk error in docs build (pydata#10545)
  Call super().__init__() in st.SearchStrategy subclasses (pydata#10543)
  CI: update actions location (pydata#10529)
  meta: Fix labeler topic-documentation (pydata#10524)
  drop_vars: use emit_user_level_warning (pydata#10528)
  Pydap flaky tests (pydata#10525)
  Remove test skip (pydata#10523)
  Improve warning message and tests for timedelta decoding (pydata#10508)
  Add dev whats-new (pydata#10522)
  Add release notes for v2025.07.1 (pydata#10520)
  Updates for Zarr 3 Dtypes (pydata#10456)
  Update Custom Indexes section in api.rst (pydata#10517)
  Expression not assigned (pydata#10507)
  Raise if `Index.create_variables` returns more variables than passed in through `set_xindex` (pydata#10503)
  Allow setting (or skipping) new indexes in open_dataset (pydata#8051)
  doc: add Pandas(Multi)Index to api reference (pydata#10515)
  Update pre-commit hooks (pydata#10510)
  Update pre-commit ruff legacy alias (pydata#10511)
  ...

Author: dcherian

.binder/environment.yml

@@ -2,7 +2,7 @@ name: xarray-examples
 channels:
   - conda-forge
 dependencies:
-  - python=3.10
+  - python=3.11
   - boto3
   - bottleneck
   - cartopy

.github/labeler.yml

@@ -45,11 +45,10 @@ topic-DataTree:
           - xarray/core/datatree*
 
 topic-documentation:
-  - changed-files:
-      - any-glob-to-any-file:
-          - doc/*
-          - "!doc/whats-new.rst"
-          - doc/**/*
+  - all:
+      - changed-files:
+          - any-glob-to-any-file: "doc/**/*"
+          - all-globs-to-all-files: "!doc/whats-new.rst"
 
 topic-groupby:
   - changed-files:

.github/workflows/benchmarks.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       ASV_DIR: "./asv_bench"
-      CONDA_ENV_FILE: ci/requirements/environment.yml
+      CONDA_ENV_FILE: ci/requirements/environment-benchmark.yml
 
     steps:
       # We need the full repo to avoid this issue
@@ -29,7 +29,7 @@ jobs:
         with:
           micromamba-version: "1.5.10-0"
           environment-file: ${{env.CONDA_ENV_FILE}}
-          environment-name: xarray-tests
+          environment-name: xarray-benchmark
           cache-environment: true
           cache-environment-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}-benchmark"
           # add "build" because of https://github.com/airspeed-velocity/asv/issues/1385

.github/workflows/ci-additional.yaml

@@ -132,15 +132,15 @@ jobs:
           fail_ci_if_error: false
 
   mypy-min:
-    name: Mypy 3.10
+    name: Mypy 3.11
     runs-on: "ubuntu-latest"
     needs: detect-ci-trigger
     defaults:
       run:
         shell: bash -l {0}
     env:
       CONDA_ENV_FILE: ci/requirements/environment.yml
-      PYTHON_VERSION: "3.10"
+      PYTHON_VERSION: "3.11"
 
     steps:
       - uses: actions/checkout@v4
@@ -239,7 +239,7 @@ jobs:
           fail_ci_if_error: false
 
   pyright39:
-    name: Pyright 3.10
+    name: Pyright 3.11
     runs-on: "ubuntu-latest"
     needs: detect-ci-trigger
     if: |
@@ -252,7 +252,7 @@ jobs:
         shell: bash -l {0}
     env:
       CONDA_ENV_FILE: ci/requirements/environment.yml
-      PYTHON_VERSION: "3.10"
+      PYTHON_VERSION: "3.11"
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/ci.yaml

@@ -47,15 +47,18 @@ jobs:
       matrix:
         os: ["ubuntu-latest", "macos-latest", "windows-latest"]
         # Bookend python versions
-        python-version: ["3.10", "3.13"]
+        python-version: ["3.11", "3.13"]
         env: [""]
         include:
           # Minimum python version:
           - env: "bare-minimum"
-            python-version: "3.10"
+            python-version: "3.11"
+            os: ubuntu-latest
+          - env: "bare-min-and-scipy"
+            python-version: "3.11"
             os: ubuntu-latest
           - env: "min-all-deps"
-            python-version: "3.10"
+            python-version: "3.11"
             os: ubuntu-latest
           # Latest python version:
           - env: "all-but-numba"
@@ -70,7 +73,7 @@ jobs:
           # The mypy tests must be executed using only 1 process in order to guarantee
           # predictable mypy output messages for comparison to expectations.
           - env: "mypy"
-            python-version: "3.10"
+            python-version: "3.11"
             numprocesses: 1
             os: ubuntu-latest
           - env: "mypy"

.github/workflows/hypothesis.yaml

@@ -110,7 +110,7 @@ jobs:
           && steps.status.outcome == 'failure'
           && github.event_name == 'schedule'
           && github.repository_owner == 'pydata'
-        uses: xarray-contrib/issue-from-pytest-log@v1
+        uses: scientific-python/issue-from-pytest-log-action@v1
         with:
           log-path: output-${{ matrix.python-version }}-log.jsonl
           issue-title: "Nightly Hypothesis tests failed"

.github/workflows/pypi-release.yaml

@@ -6,11 +6,19 @@ on:
   push:
     tags:
       - "v*"
+  pull_request:
+    types: [opened, reopened, synchronize, labeled]
+  workflow_dispatch:
 
 jobs:
   build-artifacts:
     runs-on: ubuntu-latest
-    if: github.repository == 'pydata/xarray'
+    if: ${{ github.repository == 'pydata/xarray' && (
+      (contains(github.event.pull_request.labels.*.name, 'Release') && github.event_name == 'pull_request') ||
+      github.event_name == 'release' ||
+      github.event_name == 'workflow_dispatch' ||
+      startsWith(github.ref, 'refs/tags/v')
+      ) }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -64,7 +72,6 @@ jobs:
           ls -ltrh dist
 
       - name: Verify the built dist/wheel is valid
-        if: github.event_name == 'push'
         run: |
           python -m pip install --upgrade pip
           python -m pip install dist/xarray*.whl

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

@@ -92,7 +92,7 @@ jobs:
           && steps.status.outcome == 'failure'
           && github.event_name == 'schedule'
           && github.repository_owner == 'pydata'
-        uses: xarray-contrib/issue-from-pytest-log@v1
+        uses: scientific-python/issue-from-pytest-log-action@v1
         with:
           log-path: output-${{ matrix.python-version }}-log.jsonl
 

.gitignore

@@ -10,7 +10,6 @@ __pycache__
 doc/*.nc
 doc/auto_gallery
 doc/rasm.zarr
-doc/savefig
 
 # C extensions
 *.so
@@ -71,8 +70,12 @@ asv_bench/pkgs
 # xarray specific
 doc/_build
 doc/generated/
+doc/api/generated/
 xarray/tests/data/*.grib.*.idx
 
+# Claude Code
+.claude/
+
 # Sync tools
 Icon*
 

.pre-commit-config.yaml

@@ -24,25 +24,24 @@ repos:
       - id: rst-inline-touching-normal
       - id: text-unicode-replacement-char
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    # Ruff version.
-    rev: v0.11.8
+    rev: v0.12.2
     hooks:
-      - id: ruff-format
-      - id: ruff
+      - id: ruff-check
         args: ["--fix", "--show-fixes"]
+      - id: ruff-format
   - repo: https://github.com/keewis/blackdoc
-    rev: v0.3.9
+    rev: v0.4.1
     hooks:
       - id: blackdoc
         exclude: "generate_aggregations.py"
         additional_dependencies: ["black==24.8.0"]
   - repo: https://github.com/rbubley/mirrors-prettier
-    rev: v3.5.3
+    rev: v3.6.2
     hooks:
       - id: prettier
         args: [--cache-location=.prettier_cache/cache]
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.15.0
+    rev: v1.16.1
     hooks:
       - id: mypy
         # Copied from setup.cfg