Merge branch 'main' into add_array_api_mean

Author: Illviljan

.github/labeler.yml

@@ -0,0 +1,117 @@
+Automation:
+  - changed-files:
+      - any-glob-to-any-file:
+          - .github/**
+
+CI:
+  - changed-files:
+      - any-glob-to-any-file:
+          - ci/**
+
+dependencies:
+  - changed-files:
+      - any-glob-to-any-file:
+          - ci/requirements/*
+
+topic-arrays:
+  - changed-files:
+      - any-glob-to-any-file:
+          - xarray/core/duck_array_ops.py
+
+topic-backends:
+  - changed-files:
+      - any-glob-to-any-file:
+          - xarray/backends/**
+
+topic-cftime:
+  - changed-files:
+      - any-glob-to-any-file:
+          - xarray/coding/*time*
+
+topic-CF conventions:
+  - changed-files:
+      - any-glob-to-any-file:
+          - xarray/conventions.py
+
+topic-dask:
+  - changed-files:
+      - any-glob-to-any-file:
+          - xarray/compat/dask*
+          - xarray/core/parallel.py
+
+topic-DataTree:
+  - changed-files:
+      - any-glob-to-any-file:
+          - xarray/core/datatree*
+
+topic-documentation:
+  - changed-files:
+      - any-glob-to-any-file:
+          - doc/*
+          - "!doc/whats-new.rst"
+          - doc/**/*
+
+topic-groupby:
+  - changed-files:
+      - any-glob-to-any-file:
+          - xarray/core/groupby.py
+
+topic-html-repr:
+  - changed-files:
+      - any-glob-to-any-file:
+          - xarray/core/formatting_html.py
+
+topic-hypothesis:
+  - changed-files:
+      - any-glob-to-any-file:
+          - properties/**
+          - xarray/testing/strategies.py
+
+topic-indexing:
+  - changed-files:
+      - any-glob-to-any-file:
+          - xarray/core/indexes.py
+          - xarray/core/indexing.py
+
+topic-NamedArray:
+  - changed-files:
+      - any-glob-to-any-file:
+          - xarray/namedarray/*
+
+topic-performance:
+  - changed-files:
+      - any-glob-to-any-file:
+          - asv_bench/benchmarks/**
+
+topic-plotting:
+  - changed-files:
+      - any-glob-to-any-file:
+          - xarray/plot/*
+          - xarray/plot/**/*
+
+topic-rolling:
+  - changed-files:
+      - any-glob-to-any-file:
+          - xarray/computation/rolling.py
+          - xarray/computation/rolling_exp.py
+
+topic-testing:
+  - changed-files:
+      - any-glob-to-any-file:
+          - conftest.py
+          - xarray/testing/*
+
+topic-typing:
+  - changed-files:
+      - any-glob-to-any-file:
+          - xarray/core/types.py
+
+topic-zarr:
+  - changed-files:
+      - any-glob-to-any-file:
+          - xarray/backends/zarr.py
+
+io:
+  - changed-files:
+      - any-glob-to-any-file:
+          - xarray/backends/**

.github/workflows/benchmarks.yml

@@ -10,7 +10,7 @@ env:
 
 jobs:
   benchmark:
-    if: ${{ contains( github.event.pull_request.labels.*.name, 'run-benchmark') && github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' }}
+    if: ${{ contains( github.event.pull_request.labels.*.name, 'run-benchmark') && github.event_name == 'pull_request' || contains( github.event.pull_request.labels.*.name, 'topic-performance') && github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' }}
     name: Linux
     runs-on: ubuntu-20.04
     env:

.github/workflows/ci-additional.yaml

@@ -123,7 +123,7 @@ jobs:
           python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report
 
       - name: Upload mypy coverage to Codecov
-        uses: codecov/codecov-action@v5.3.1
+        uses: codecov/codecov-action@v5.4.0
         with:
           file: mypy_report/cobertura.xml
           flags: mypy
@@ -174,7 +174,7 @@ jobs:
           python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report
 
       - name: Upload mypy coverage to Codecov
-        uses: codecov/codecov-action@v5.3.1
+        uses: codecov/codecov-action@v5.4.0
         with:
           file: mypy_report/cobertura.xml
           flags: mypy-min
@@ -230,7 +230,7 @@ jobs:
           python -m pyright xarray/
 
       - name: Upload pyright coverage to Codecov
-        uses: codecov/codecov-action@v5.3.1
+        uses: codecov/codecov-action@v5.4.0
         with:
           file: pyright_report/cobertura.xml
           flags: pyright
@@ -286,7 +286,7 @@ jobs:
           python -m pyright xarray/
 
       - name: Upload pyright coverage to Codecov
-        uses: codecov/codecov-action@v5.3.1
+        uses: codecov/codecov-action@v5.4.0
         with:
           file: pyright_report/cobertura.xml
           flags: pyright39

.github/workflows/ci.yaml

@@ -67,6 +67,16 @@ jobs:
           - env: "flaky"
             python-version: "3.13"
             os: ubuntu-latest
+          # 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"
+            numprocesses: 1
+            os: ubuntu-latest
+          - env: "mypy"
+            python-version: "3.13"
+            numprocesses: 1
+            os: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
@@ -88,6 +98,10 @@ jobs:
             then
               echo "CONDA_ENV_FILE=ci/requirements/environment.yml" >> $GITHUB_ENV
               echo "PYTEST_ADDOPTS=-m 'flaky or network' --run-flaky --run-network-tests -W default" >> $GITHUB_ENV
+            elif [[ "${{ matrix.env }}" == "mypy" ]] ;
+            then
+              echo "CONDA_ENV_FILE=ci/requirements/environment.yml" >> $GITHUB_ENV
+              echo "PYTEST_ADDOPTS=-n 1 -m 'mypy' --run-mypy -W default" >> $GITHUB_ENV
             else
               echo "CONDA_ENV_FILE=ci/requirements/${{ matrix.env }}.yml" >> $GITHUB_ENV
             fi
@@ -144,7 +158,7 @@ jobs:
           save-always: true
 
       - name: Run tests
-        run: python -m pytest -n 4
+        run: python -m pytest -n ${{ matrix.numprocesses || 4 }}
           --timeout 180
           --cov=xarray
           --cov-report=xml
@@ -158,7 +172,7 @@ jobs:
           path: pytest.xml
 
       - name: Upload code coverage to Codecov
-        uses: codecov/codecov-action@v5.3.1
+        uses: codecov/codecov-action@v5.4.0
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:

.github/workflows/label-prs.yml

@@ -0,0 +1,12 @@
+name: "PR Labeler"
+on:
+  - pull_request_target
+
+jobs:
+  label:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/labeler@v5
+        with:
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          sync-labels: false

.github/workflows/nightly-wheels.yml

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

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

@@ -84,7 +84,7 @@ jobs:
         if: success()
         id: status
         run: |
-          python -m pytest --timeout=60 -rf \
+          python -m pytest --timeout=60 -rf -nauto \
             --report-log output-${{ matrix.python-version }}-log.jsonl
       - name: Generate and publish the report
         if: |
@@ -140,7 +140,7 @@ jobs:
         run: |
           python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report
       - name: Upload mypy coverage to Codecov
-        uses: codecov/codecov-action@v5.3.1
+        uses: codecov/codecov-action@v5.4.0
         with:
           file: mypy_report/cobertura.xml
           flags: mypy

.gitignore

@@ -81,3 +81,8 @@ doc/team-panel.txt
 doc/external-examples-gallery.txt
 doc/notebooks-examples-gallery.txt
 doc/videos-gallery.txt
+
+# 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
+# think we shouldn't...)
+uv.lock

.pre-commit-config.yaml

@@ -25,7 +25,7 @@ repos:
       - id: text-unicode-replacement-char
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.9.4
+    rev: v0.11.4
     hooks:
       - id: ruff-format
       - id: ruff
@@ -37,12 +37,12 @@ repos:
         exclude: "generate_aggregations.py"
         additional_dependencies: ["black==24.8.0"]
   - repo: https://github.com/rbubley/mirrors-prettier
-    rev: v3.4.2
+    rev: v3.5.3
     hooks:
       - id: prettier
         args: [--cache-location=.prettier_cache/cache]
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.14.1
+    rev: v1.15.0
     hooks:
       - id: mypy
         # Copied from setup.cfg
@@ -69,7 +69,13 @@ repos:
       - id: taplo-format
         args: ["--option", "array_auto_collapse=false"]
   - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.23
+    rev: v0.24.1
     hooks:
       - id: validate-pyproject
         additional_dependencies: ["validate-pyproject-schema-store[all]"]
+  - repo: https://github.com/crate-ci/typos
+    rev: v1
+    hooks:
+      - id: typos
+        # https://github.com/crate-ci/typos/issues/347
+        pass_filenames: false

README.md

@@ -1,9 +1,9 @@
 # xarray: N-D labeled arrays and datasets
 
-[![CI](https://github.com/pydata/xarray/workflows/CI/badge.svg?branch=main)](https://github.com/pydata/xarray/actions?query=workflow%3ACI)
+[![CI](https://github.com/pydata/xarray/actions/workflows/ci.yaml/badge.svg?branch=main)](https://github.com/pydata/xarray/actions/workflows/ci.yaml?query=branch%3Amain)
 [![Code coverage](https://codecov.io/gh/pydata/xarray/branch/main/graph/badge.svg?flag=unittests)](https://codecov.io/gh/pydata/xarray)
 [![Docs](https://readthedocs.org/projects/xray/badge/?version=latest)](https://docs.xarray.dev/)
-[![Benchmarked with asv](https://img.shields.io/badge/benchmarked%20by-asv-green.svg?style=flat)](https://pandas.pydata.org/speed/xarray/)
+[![Benchmarked with asv](https://img.shields.io/badge/benchmarked%20by-asv-green.svg?style=flat)](https://asv-runner.github.io/asv-collection/xarray/)
 [![Formatted with black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/python/black)
 [![Checked with mypy](http://www.mypy-lang.org/static/mypy_badge.svg)](http://mypy-lang.org/)
 [![Available on pypi](https://img.shields.io/pypi/v/xarray.svg)](https://pypi.python.org/pypi/xarray/)