Merge branch 'main' into issue4926

pydata · Dec 25, 2024 · 62c5853 · 62c5853
2 parents 34c754d + 6875c64
commit 62c5853
Show file tree

Hide file tree

Showing 192 changed files with 7,192 additions and 3,479 deletions.
diff --git a/.binder/environment.yml b/.binder/environment.yml
@@ -16,7 +16,7 @@ dependencies:
   - h5py
   - hdf5
   - iris
-  - lxml    # Optional dep of pydap
+  - lxml # Optional dep of pydap
   - matplotlib
   - nc-time-axis
   - netcdf4

diff --git a/.codecov.yml b/.codecov.yml
@@ -10,7 +10,7 @@ coverage:
         flags:
           - unittests
         paths:
-         - "!xarray/tests/"
+          - "!xarray/tests/"
       unittests:
         target: 90%
         flags:

diff --git a/.github/ISSUE_TEMPLATE/bugreport.yml b/.github/ISSUE_TEMPLATE/bugreport.yml
@@ -37,7 +37,7 @@ body:
         Please confirm that the bug report is in an excellent state, so we can understand & fix it quickly & efficiently. For more details, check out:
 
         - [Minimal Complete Verifiable Examples](https://stackoverflow.com/help/mcve)
-        - [Craft Minimal Bug Reports](http://matthewrocklin.com/blog/work/2018/02/28/minimal-bug-reports)
+        - [Craft Minimal Bug Reports](https://matthewrocklin.com/minimal-bug-reports)
 
       options:
         - label: Minimal example — the example is as focused as reasonably possible to demonstrate the underlying issue in xarray.

diff --git a/.github/config.yml b/.github/config.yml
@@ -14,7 +14,7 @@ newIssueWelcomeComment: >
 newPRWelcomeComment: >
   Thank you for opening this pull request! It may take us a few days to respond here, so thank you for being patient.
 
-  If you have questions, some answers may be found in our [contributing guidelines](http://docs.xarray.dev/en/stable/contributing.html).
+  If you have questions, some answers may be found in our [contributing guidelines](https://docs.xarray.dev/en/stable/contributing.html).
 
 # Comment to be posted to on pull requests merged by a first time user
 firstPRMergeComment: >

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,10 +1,10 @@
 version: 2
 updates:
-  - package-ecosystem: 'github-actions'
-    directory: '/'
+  - package-ecosystem: "github-actions"
+    directory: "/"
     schedule:
       # Check for updates once a week
-      interval: 'weekly'
+      interval: "weekly"
     groups:
       actions:
         patterns:

diff --git a/.github/workflows/benchmarks-last-release.yml b/.github/workflows/benchmarks-last-release.yml
@@ -24,14 +24,15 @@ jobs:
       - name: Set up conda environment
         uses: mamba-org/setup-micromamba@v2
         with:
+          micromamba-version: "1.5.10-0"
           environment-file: ${{env.CONDA_ENV_FILE}}
           environment-name: xarray-tests
           cache-environment: true
           cache-environment-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}-benchmark"
           create-args: >-
             asv
 
-      - name: 'Get Previous tag'
+      - name: "Get Previous tag"
         id: previoustag
         uses: "WyriHaximus/github-action-get-previous-tag@v1"
         # with:

diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -27,6 +27,7 @@ jobs:
       - name: Set up conda environment
         uses: mamba-org/setup-micromamba@v2
         with:
+          micromamba-version: "1.5.10-0"
           environment-file: ${{env.CONDA_ENV_FILE}}
           environment-name: xarray-tests
           cache-environment: true
@@ -35,8 +36,7 @@ jobs:
           create-args: >-
             asv
             python-build
-            mamba
-
+            mamba<=1.5.10
 
       - name: Run benchmarks
         shell: bash -l {0}

diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml
@@ -61,7 +61,6 @@ jobs:
           environment-name: xarray-tests
           create-args: >-
             python=${{env.PYTHON_VERSION}}
-            conda
           cache-environment: true
           cache-environment-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}"
 
@@ -70,8 +69,6 @@ jobs:
           python -m pip install --no-deps -e .
       - name: Version info
         run: |
-          conda info -a
-          conda list
           python xarray/util/print_versions.py
       - name: Run doctests
         run: |
@@ -109,27 +106,24 @@ jobs:
           environment-name: xarray-tests
           create-args: >-
             python=${{env.PYTHON_VERSION}}
-            conda
           cache-environment: true
           cache-environment-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}"
       - name: Install xarray
         run: |
           python -m pip install --no-deps -e .
       - name: Version info
         run: |
-          conda info -a
-          conda list
           python xarray/util/print_versions.py
       - name: Install mypy
         run: |
-          python -m pip install "mypy==1.11.2" --force-reinstall
+          python -m pip install "mypy==1.13" --force-reinstall
 
       - name: Run mypy
         run: |
           python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report
 
       - name: Upload mypy coverage to Codecov
-        uses: codecov/codecov-action@v4.6.0
+        uses: codecov/codecov-action@v5.1.2
         with:
           file: mypy_report/cobertura.xml
           flags: mypy
@@ -163,27 +157,24 @@ jobs:
           environment-name: xarray-tests
           create-args: >-
             python=${{env.PYTHON_VERSION}}
-            conda
           cache-environment: true
           cache-environment-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}"
       - name: Install xarray
         run: |
           python -m pip install --no-deps -e .
       - name: Version info
         run: |
-          conda info -a
-          conda list
           python xarray/util/print_versions.py
       - name: Install mypy
         run: |
-          python -m pip install "mypy==1.11.2" --force-reinstall
+          python -m pip install "mypy==1.13" --force-reinstall
 
       - name: Run mypy
         run: |
           python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report
 
       - name: Upload mypy coverage to Codecov
-        uses: codecov/codecov-action@v4.6.0
+        uses: codecov/codecov-action@v5.1.2
         with:
           file: mypy_report/cobertura.xml
           flags: mypy-min
@@ -222,16 +213,13 @@ jobs:
           environment-name: xarray-tests
           create-args: >-
             python=${{env.PYTHON_VERSION}}
-            conda
           cache-environment: true
           cache-environment-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}"
       - name: Install xarray
         run: |
           python -m pip install --no-deps -e .
       - name: Version info
         run: |
-          conda info -a
-          conda list
           python xarray/util/print_versions.py
       - name: Install pyright
         run: |
@@ -242,7 +230,7 @@ jobs:
           python -m pyright xarray/
 
       - name: Upload pyright coverage to Codecov
-        uses: codecov/codecov-action@v4.6.0
+        uses: codecov/codecov-action@v5.1.2
         with:
           file: pyright_report/cobertura.xml
           flags: pyright
@@ -281,16 +269,13 @@ jobs:
           environment-name: xarray-tests
           create-args: >-
             python=${{env.PYTHON_VERSION}}
-            conda
           cache-environment: true
           cache-environment-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}"
       - name: Install xarray
         run: |
           python -m pip install --no-deps -e .
       - name: Version info
         run: |
-          conda info -a
-          conda list
           python xarray/util/print_versions.py
       - name: Install pyright
         run: |
@@ -301,7 +286,7 @@ jobs:
           python -m pyright xarray/
 
       - name: Upload pyright coverage to Codecov
-        uses: codecov/codecov-action@v4.6.0
+        uses: codecov/codecov-action@v5.1.2
         with:
           file: pyright_report/cobertura.xml
           flags: pyright39
@@ -318,6 +303,9 @@ jobs:
       run:
         shell: bash -l {0}
 
+    env:
+      COLUMNS: 120
+
     steps:
       - uses: actions/checkout@v4
         with:
@@ -330,13 +318,16 @@ jobs:
           create-args: >-
             python=3.12
             pyyaml
-            conda
             python-dateutil
+            cytoolz
+            rich
+            rich-click
+            py-rattler
 
       - name: All-deps minimum versions policy
         run: |
-          python ci/min_deps_check.py ci/requirements/min-all-deps.yml
+          python ci/minimum_versions.py ci/requirements/min-all-deps.yml
 
       - name: Bare minimum versions policy
         run: |
-          python ci/min_deps_check.py ci/requirements/bare-minimum.yml
+          python ci/minimum_versions.py ci/requirements/bare-minimum.yml
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -116,7 +116,6 @@ jobs:
           cache-environment-key: "${{runner.os}}-${{runner.arch}}-py${{matrix.python-version}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}"
           create-args: >-
             python=${{matrix.python-version}}
-            conda
 
       # We only want to install this on one run, because otherwise we'll have
       # duplicate annotations.
@@ -131,8 +130,6 @@ jobs:
 
       - name: Version info
         run: |
-          conda info -a
-          conda list
           python xarray/util/print_versions.py
 
       - name: Import xarray
@@ -162,7 +159,9 @@ jobs:
           path: pytest.xml
 
       - name: Upload code coverage to Codecov
-        uses: codecov/[email protected]
+        uses: codecov/[email protected]
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:
           file: ./coverage.xml
           flags: unittests

diff --git a/.github/workflows/hypothesis.yaml b/.github/workflows/hypothesis.yaml
@@ -37,12 +37,12 @@ jobs:
     runs-on: "ubuntu-latest"
     needs: detect-ci-trigger
     if: |
-        always()
-        && (
-            needs.detect-ci-trigger.outputs.triggered == 'false'
-            && ( (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
-                || contains( github.event.pull_request.labels.*.name, 'run-slow-hypothesis'))
-        )
+      always()
+      && (
+          needs.detect-ci-trigger.outputs.triggered == 'false'
+          && ( (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
+              || contains( github.event.pull_request.labels.*.name, 'run-slow-hypothesis'))
+      )
     defaults:
       run:
         shell: bash -l {0}
@@ -76,8 +76,6 @@ jobs:
           python -m pip install --no-deps -e .
       - name: Version info
         run: |
-          conda info -a
-          conda list
           python xarray/util/print_versions.py
 
       # https://github.com/actions/cache/blob/main/tips-and-workarounds.md#update-a-cache
@@ -94,8 +92,8 @@ jobs:
         if: success()
         id: status
         run: |
-           python -m pytest --hypothesis-show-statistics --run-slow-hypothesis properties/*.py \
-             --report-log output-${{ matrix.python-version }}-log.jsonl
+          python -m pytest --hypothesis-show-statistics --run-slow-hypothesis properties/*.py \
+            --report-log output-${{ matrix.python-version }}-log.jsonl
 
       # explicitly save the cache so it gets updated, also do this even if it fails.
       - name: Save cached hypothesis directory

diff --git a/.github/workflows/pypi-release.yaml b/.github/workflows/pypi-release.yaml
@@ -5,7 +5,7 @@ on:
       - published
   push:
     tags:
-      - 'v*'
+      - "v*"
 
 jobs:
   build-artifacts:
@@ -88,12 +88,11 @@ jobs:
           path: dist
       - name: Publish package to TestPyPI
         if: github.event_name == 'push'
-        uses: pypa/gh-action-pypi-publish@v1.10.3
+        uses: pypa/gh-action-pypi-publish@v1.12.3
         with:
           repository_url: https://test.pypi.org/legacy/
           verbose: true
 
-
   upload-to-pypi:
     needs: test-built-dist
     if: github.event_name == 'release'
@@ -111,6 +110,6 @@ jobs:
           name: releases
           path: dist
       - name: Publish package to PyPI
-        uses: pypa/gh-action-pypi-publish@v1.10.3
+        uses: pypa/gh-action-pypi-publish@v1.12.3
         with:
           verbose: true