Merge branch 'main' into doc-add-repr-inline-to-custom-index

Author: jsignell

.github/workflows/ci-additional.yaml

@@ -14,7 +14,7 @@ concurrency:
 
 env:
   FORCE_COLOR: 3
-  PIXI_VERSION: "v0.58.0"
+  PIXI_VERSION: "v0.63.1"
 
 jobs:
   detect-ci-trigger:
@@ -37,7 +37,7 @@ jobs:
   cache-pixi-lock:
     uses: ./.github/workflows/cache-pixi-lock.yml
     with:
-      pixi-version: "v0.58.0" # keep in sync with env var above
+      pixi-version: "v0.63.1" # keep in sync with env var above
   doctest:
     name: Doctests
     runs-on: "ubuntu-latest"
@@ -244,10 +244,8 @@ jobs:
   min-version-policy:
     name: Minimum Version Policy
     runs-on: "ubuntu-latest"
-    needs: detect-ci-trigger
-    # min-version-policy doesn't work with Pixi yet https://github.com/pydata/xarray/pull/10888#discussion_r2504335457
-    if: false
-    # if: needs.detect-ci-trigger.outputs.triggered == 'false'
+    needs: [detect-ci-trigger, cache-pixi-lock]
+    if: needs.detect-ci-trigger.outputs.triggered == 'false'
     defaults:
       run:
         shell: bash -l {0}
@@ -260,18 +258,30 @@ jobs:
         with:
           fetch-depth: 0 # Fetch all history for all branches and tags.
 
-      - uses: actions/setup-python@v6
+      - name: Restore cached pixi lockfile
+        uses: actions/cache/restore@v5
+        id: restore-pixi-lock
         with:
-          python-version: "3.x"
+          enableCrossOsArchive: true
+          path: |
+            pixi.lock
+          key: ${{ needs.cache-pixi-lock.outputs.cache-id }}
 
-      - name: All-deps minimum versions policy
-        uses: xarray-contrib/minimum-dependency-versions@3db8e1c17328ee1e27dfe4db90d908644856eb61 # v1.0.0
+      - uses: prefix-dev/setup-pixi@v0.9.3
         with:
-          policy: ci/policy.yaml
-          environment-paths: ci/requirements/min-all-deps.yml
+          pixi-version: ${{ env.PIXI_VERSION }}
+          cache: true
+          environments: "policy"
+          cache-write: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
 
       - name: Bare minimum versions policy
-        uses: xarray-contrib/minimum-dependency-versions@3db8e1c17328ee1e27dfe4db90d908644856eb61 # v1.0.0
-        with:
-          policy: ci/policy.yaml
-          environment-paths: ci/requirements/bare-minimum.yml
+        run: |
+          pixi run policy-bare-minimum
+
+      - name: Bare minimum and scipy versions policy
+        run: |
+          pixi run policy-bare-min-and-scipy
+
+      - name: All-deps minimum versions policy
+        run: |
+          pixi run policy-min-versions

.github/workflows/ci.yaml

@@ -14,7 +14,7 @@ concurrency:
 
 env:
   FORCE_COLOR: 3
-  PIXI_VERSION: "v0.58.0"
+  PIXI_VERSION: "v0.63.1"
 
 jobs:
   detect-ci-trigger:
@@ -38,7 +38,7 @@ jobs:
   cache-pixi-lock:
     uses: ./.github/workflows/cache-pixi-lock.yml
     with:
-      pixi-version: "v0.58.0" # keep in sync with env var above
+      pixi-version: "v0.63.1" # keep in sync with env var above
   test:
     name: "${{ matrix.os }} | ${{ matrix.pixi-env }}${{ matrix.pytest-addopts && format(' ({0})', matrix.pytest-addopts) || '' }}"
     runs-on: ${{ matrix.os }}

.github/workflows/hypothesis.yaml

@@ -13,7 +13,7 @@ on:
 
 env:
   FORCE_COLOR: 3
-  PIXI_VERSION: "v0.58.0"
+  PIXI_VERSION: "v0.63.1"
 
 jobs:
   detect-ci-trigger:
@@ -37,7 +37,7 @@ jobs:
   cache-pixi-lock:
     uses: ./.github/workflows/cache-pixi-lock.yml
     with:
-      pixi-version: "v0.58.0" # keep in sync with env var above
+      pixi-version: "v0.63.1" # keep in sync with env var above
 
   hypothesis:
     name: Slow Hypothesis Tests

.github/workflows/nightly-wheels.yml

@@ -38,7 +38,7 @@ jobs:
           fi
 
       - name: Upload wheel
-        uses: scientific-python/upload-nightly-action@b36e8c0c10dbcfd2e05bf95f17ef8c14fd708dbf # 0.6.2
+        uses: scientific-python/upload-nightly-action@5748273c71e2d8d3a61f3a11a16421c8954f9ecf # 0.6.3
         with:
           anaconda_nightly_upload_token: ${{ secrets.ANACONDA_NIGHTLY }}
           artifacts_path: dist

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

@@ -17,7 +17,7 @@ concurrency:
 
 env:
   FORCE_COLOR: 3
-  PIXI_VERSION: "v0.58.0"
+  PIXI_VERSION: "v0.63.1"
 
 jobs:
   detect-ci-trigger:
@@ -40,7 +40,7 @@ jobs:
   cache-pixi-lock:
     uses: ./.github/workflows/cache-pixi-lock.yml
     with:
-      pixi-version: "v0.58.0" # keep in sync with env var above
+      pixi-version: "v0.63.1" # keep in sync with env var above
   upstream-dev:
     name: upstream-dev
     runs-on: ubuntu-latest

.gitignore

@@ -84,6 +84,9 @@ doc/team-panel.txt
 doc/external-examples-gallery.txt
 doc/notebooks-examples-gallery.txt
 doc/videos-gallery.txt
+doc/*.zarr
+doc/*.nc
+doc/*.h5
 
 # Until we support this properly, excluding from gitignore. (adding it to
 # gitignore to make it _easier_ to work with `uv`, not as an indication that I

.pre-commit-config.yaml

@@ -24,7 +24,7 @@ repos:
       - id: rst-inline-touching-normal
       - id: text-unicode-replacement-char
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.7
+    rev: v0.14.10
     hooks:
       - id: ruff-check
         args: ["--fix", "--show-fixes"]
@@ -37,12 +37,12 @@ repos:
         # make sure this is the most recent version of black
         additional_dependencies: ["black==25.11.0"]
   - repo: https://github.com/rbubley/mirrors-prettier
-    rev: v3.7.3
+    rev: v3.7.4
     hooks:
       - id: prettier
         args: ["--cache-location=.prettier_cache/cache"]
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.19.0
+    rev: v1.19.1
     hooks:
       - id: mypy
         # Copied from setup.cfg
@@ -76,6 +76,6 @@ repos:
       - id: validate-pyproject
         additional_dependencies: ["validate-pyproject-schema-store[all]"]
   - repo: https://github.com/adhtruong/mirrors-typos
-    rev: v1.40.0
+    rev: v1.41.0
     hooks:
       - id: typos

ci/policy.yaml

@@ -24,5 +24,8 @@ policy:
     - pytest-xdist
     - pytest-hypothesis
     - hypothesis
+    - pytz
+    - pytest-reportlog
   # these packages don't fail the CI, but will be printed in the report
-  ignored_violations: []
+  ignored_violations:
+    - array-api-strict

doc/Makefile

@@ -25,7 +25,7 @@ help:
 	@echo "  singlehtml to make a single large HTML file"
 	@echo "  pickle     to make pickle files"
 	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  htmlhelp   to make HTML files and an HTML help project"
 	@echo "  qthelp     to make HTML files and a qthelp project"
 	@echo "  applehelp  to make an Apple Help Book"
 	@echo "  devhelp    to make HTML files and a Devhelp project"

doc/api/top-level.rst

@@ -6,6 +6,12 @@ Top-level functions
 Computation
 -----------
 
+.. note::
+
+   For worked examples and advanced usage of ``apply_ufunc``, see the
+   :doc:`User Guide on Computation </user-guide/computation>`, and the
+   `apply_ufunc tutorial <https://tutorial.xarray.dev/advanced/apply_ufunc/apply_ufunc.html>`_.
+
 .. autosummary::
    :toctree: ../generated/