Merge branch 'main' into concat_default_kwargs

Author: jsignell

.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/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: |

.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.9
+    rev: v0.11.4
     hooks:
       - id: ruff-format
       - id: ruff
@@ -69,12 +69,12 @@ 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: dictgen-v0.3.1
+    rev: v1
     hooks:
       - id: typos
         # https://github.com/crate-ci/typos/issues/347

README.md

@@ -1,6 +1,6 @@
 # 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://asv-runner.github.io/asv-collection/xarray/)

asv_bench/benchmarks/repr.py

@@ -25,6 +25,25 @@ def time_repr_html(self):
         self.ds._repr_html_()
 
 
+class ReprDataTree:
+    def setup(self):
+        # construct a datatree with 500 nodes
+        number_of_files = 20
+        number_of_groups = 25
+        tree_dict = {}
+        for f in range(number_of_files):
+            for g in range(number_of_groups):
+                tree_dict[f"file_{f}/group_{g}"] = xr.Dataset({"g": f * g})
+
+        self.dt = xr.DataTree.from_dict(tree_dict)
+
+    def time_repr(self):
+        repr(self.dt)
+
+    def time_repr_html(self):
+        self.dt._repr_html_()
+
+
 class ReprMultiIndex:
     def setup(self):
         index = pd.MultiIndex.from_product(

ci/install-upstream-wheels.sh

@@ -53,7 +53,7 @@ python -m pip install \
     git+https://github.com/dask/dask \
     git+https://github.com/dask/dask-expr \
     git+https://github.com/dask/distributed \
-    git+https://github.com/zarr-developers/zarr \
+    git+https://github.com/zarr-developers/zarr-python \
     git+https://github.com/Unidata/cftime \
     git+https://github.com/pypa/packaging \
     git+https://github.com/hgrecco/pint \

design_notes/flexible_indexes_notes.md

@@ -166,7 +166,7 @@ Besides `pandas.Index`, other indexes currently supported in Xarray like `CFTime
 
 Like for the indexes, explicit coordinate creation should be preferred over implicit coordinate creation. However, there may be some situations where we would like to keep creating coordinates implicitly for backwards compatibility.
 
-For example, it is currently possible to pass a `pandas.MulitIndex` object as a coordinate to the Dataset/DataArray constructor:
+For example, it is currently possible to pass a `pandas.MultiIndex` object as a coordinate to the Dataset/DataArray constructor:
 
 ```python
 >>> midx = pd.MultiIndex.from_arrays([['a', 'b'], [0, 1]], names=['lvl1', 'lvl2'])