Merge branch 'pydata:main' into fix-6220-use-fast-path-when-grouping-…

…unique-monotonic-variable

.github/labeler.yml

@@ -54,10 +54,6 @@ topic-indexing:
   - xarray/core/indexes.py
   - xarray/core/indexing.py
 
-run-benchmark:
-  - asv_bench/benchmarks/*
-  - asv_bench/benchmarks/**/*
-
 topic-performance:
   - asv_bench/benchmarks/*
   - asv_bench/benchmarks/**/*

.github/workflows/benchmarks.yml

@@ -7,7 +7,7 @@ on:
 
 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:
@@ -22,7 +22,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up conda environment
-        uses: mamba-org/provision-with-micromamba@v14
+        uses: mamba-org/provision-with-micromamba@v15
         with:
           environment-file: ${{env.CONDA_ENV_FILE}}
           environment-name: xarray-tests

.github/workflows/ci-additional.yaml

@@ -53,7 +53,7 @@ jobs:
           echo "TODAY=$(date  +'%Y-%m-%d')" >> $GITHUB_ENV
 
       - name: Setup micromamba
-        uses: mamba-org/provision-with-micromamba@v14
+        uses: mamba-org/provision-with-micromamba@v15
         with:
           environment-file: ${{env.CONDA_ENV_FILE}}
           environment-name: xarray-tests
@@ -100,7 +100,7 @@ jobs:
         run: |
           echo "TODAY=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
       - name: Setup micromamba
-        uses: mamba-org/provision-with-micromamba@v14
+        uses: mamba-org/provision-with-micromamba@v15
         with:
           environment-file: ${{env.CONDA_ENV_FILE}}
           environment-name: xarray-tests
@@ -134,18 +134,16 @@ jobs:
           name: codecov-umbrella
           fail_ci_if_error: false
 
-  mypy38:
-    name: Mypy 3.8
+  mypy39:
+    name: Mypy 3.9
     runs-on: "ubuntu-latest"
     needs: detect-ci-trigger
-    # temporarily skipping due to https://github.com/pydata/xarray/issues/6551
-    if: needs.detect-ci-trigger.outputs.triggered == 'false'
     defaults:
       run:
         shell: bash -l {0}
     env:
       CONDA_ENV_FILE: ci/requirements/environment.yml
-      PYTHON_VERSION: "3.8"
+      PYTHON_VERSION: "3.9"
 
     steps:
       - uses: actions/checkout@v3
@@ -156,7 +154,7 @@ jobs:
         run: |
           echo "TODAY=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
       - name: Setup micromamba
-        uses: mamba-org/provision-with-micromamba@v14
+        uses: mamba-org/provision-with-micromamba@v15
         with:
           environment-file: ${{env.CONDA_ENV_FILE}}
           environment-name: xarray-tests
@@ -185,7 +183,7 @@ jobs:
         uses: codecov/[email protected]
         with:
           file: mypy_report/cobertura.xml
-          flags: mypy38
+          flags: mypy39
           env_vars: PYTHON_VERSION
           name: codecov-umbrella
           fail_ci_if_error: false
@@ -212,7 +210,7 @@ jobs:
           fetch-depth: 0 # Fetch all history for all branches and tags.
 
       - name: Setup micromamba
-        uses: mamba-org/provision-with-micromamba@v14
+        uses: mamba-org/provision-with-micromamba@v15
         with:
           environment-name: xarray-tests
           environment-file: false

.github/workflows/ci.yaml

@@ -42,15 +42,15 @@ jobs:
       matrix:
         os: ["ubuntu-latest", "macos-latest", "windows-latest"]
         # Bookend python versions
-        python-version: ["3.8", "3.10"]
+        python-version: ["3.9", "3.10", "3.11"]
         env: [""]
         include:
           # Minimum python version:
           - env: "bare-minimum"
-            python-version: "3.8"
+            python-version: "3.9"
             os: ubuntu-latest
           - env: "min-all-deps"
-            python-version: "3.8"
+            python-version: "3.9"
             os: ubuntu-latest
           # Latest python version:
           - env: "all-but-dask"
@@ -67,7 +67,13 @@ jobs:
         run: |
           echo "TODAY=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
 
-          if [[ ${{ matrix.os }} == windows* ]] ;
+          if [[ "${{matrix.python-version}}" == "3.11" ]]; then
+            if [[ ${{matrix.os}} == windows* ]]; then
+              echo "CONDA_ENV_FILE=ci/requirements/environment-windows-py311.yml" >> $GITHUB_ENV
+            else
+              echo "CONDA_ENV_FILE=ci/requirements/environment-py311.yml" >> $GITHUB_ENV
+            fi
+          elif [[ ${{ matrix.os }} == windows* ]] ;
           then
             echo "CONDA_ENV_FILE=ci/requirements/environment-windows.yml" >> $GITHUB_ENV
           elif [[ "${{ matrix.env }}" != "" ]] ;
@@ -86,7 +92,7 @@ jobs:
           echo "PYTHON_VERSION=${{ matrix.python-version }}" >> $GITHUB_ENV
 
       - name: Setup micromamba
-        uses: mamba-org/provision-with-micromamba@v14
+        uses: mamba-org/provision-with-micromamba@v15
         with:
           environment-file: ${{ env.CONDA_ENV_FILE }}
           environment-name: xarray-tests

.github/workflows/label-prs.yml

@@ -9,4 +9,6 @@ jobs:
     - uses: actions/labeler@main
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
-        sync-labels: false
+        # Workaround for sync-labels bug:
+        # https://github.com/actions/labeler/issues/112
+        sync-labels: ""

.github/workflows/pypi-release.yaml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/setup-python@v4
         name: Install Python
         with:
-          python-version: 3.8
+          python-version: "3.11"
 
       - name: Install dependencies
         run: |
@@ -53,7 +53,7 @@ jobs:
       - uses: actions/setup-python@v4
         name: Install Python
         with:
-          python-version: 3.8
+          python-version: "3.11"
       - uses: actions/download-artifact@v3
         with:
           name: releases

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

@@ -54,7 +54,7 @@ jobs:
         with:
           fetch-depth: 0 # Fetch all history for all branches and tags.
       - name: Set up conda environment
-        uses: mamba-org/provision-with-micromamba@v14
+        uses: mamba-org/provision-with-micromamba@v15
         with:
           environment-file: ci/requirements/environment.yml
           environment-name: xarray-tests

.pre-commit-config.yaml

@@ -29,7 +29,7 @@ repos:
     hooks:
       - id: pyupgrade
         args:
-          - "--py38-plus"
+          - "--py39-plus"
   # https://github.com/python/black#version-control-integration
   - repo: https://github.com/psf/black
     rev: 22.12.0

.readthedocs.yaml

@@ -1,9 +1,14 @@
 version: 2
 
 build:
-  os: ubuntu-20.04
+  os: ubuntu-22.04
   tools:
     python: mambaforge-4.10
+  jobs:
+    post_checkout:
+      - (git --no-pager log --pretty="tformat:%s" -1 | grep -vqF "[skip-rtd]") || exit 183
+    pre_install:
+      - git update-index --assume-unchanged doc/conf.py ci/requirements/doc.yml
 
 conda:
   environment: ci/requirements/doc.yml

HOW_TO_RELEASE.md

@@ -92,7 +92,15 @@ upstream        https://github.com/pydata/xarray (push)
       ```
     You're done pushing to main!
 
-13. Issue the release announcement to mailing lists & Twitter. For bug fix releases, I
+13. Update the version available on pyodide:
+    - Open the PyPI page for [Xarray downloads](https://pypi.org/project/xarray/#files)
+    - Clone the [pyodide repository](https://github.com/pyodide/pyodide).
+    - Edit `packages/xarray/meta.yaml` to update the
+        - link to the wheel (under "Built Distribution" on the PyPI page)
+        - SHA256 hash (Click "Show Hashes" next to the link to the wheel)
+    - Open a pull request to pyodide
+
+14. Issue the release announcement to mailing lists & Twitter. For bug fix releases, I
     usually only email [email protected]. For major/feature releases, I will email a broader
     list (no more than once every 3-6 months):
       - [email protected]

asv_bench/asv.conf.json

@@ -40,7 +40,7 @@
 
     // The Pythons you'd like to test against.  If not provided, defaults
     // to the current version of Python used to run `asv`.
-    "pythons": ["3.8"],
+    "pythons": ["3.10"],
 
     // The matrix of dependencies to test.  Each key is the name of a
     // package (in PyPI) and the values are version numbers.  An empty