Merge branch 'main' into apply-to-dataset

Author: keewis

.github/workflows/ci-pre-commit-autoupdate.yaml

@@ -35,7 +35,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           EXECUTE_COMMANDS: |
             python -m pre_commit autoupdate
-            python .github/workflows/sync_linter_versions.py .pre-commit-config.yaml ci/requirements/mypy_only
             python -m pre_commit run --all-files
           COMMIT_MESSAGE: 'pre-commit: autoupdate hook versions'
           COMMIT_NAME: 'github-actions[bot]'

.github/workflows/ci.yaml

@@ -90,14 +90,14 @@ jobs:
         run: python -m pytest -n 4
           --cov=xarray
           --cov-report=xml
-          --junitxml=test-results/${{ runner.os }}-${{ matrix.python-version }}.xml
+          --junitxml=pytest.xml
 
       - name: Upload test results
         if: always()
         uses: actions/upload-artifact@v2
         with:
           name: Test results for ${{ runner.os }}-${{ matrix.python-version }}
-          path: test-results/${{ runner.os }}-${{ matrix.python-version }}.xml
+          path: pytest.xml
 
       - name: Upload code coverage to Codecov
         uses: codecov/codecov-action@v1
@@ -123,4 +123,4 @@ jobs:
       - name: Publish Unit Test Results
         uses: EnricoMi/publish-unit-test-result-action@v1
         with:
-          files: test-results/*.xml
+          files: test-results/**/*.xml

.github/workflows/publish-test-results.yaml

@@ -0,0 +1,44 @@
+# Copied from https://github.com/EnricoMi/publish-unit-test-result-action/blob/v1.18/README.md#support-fork-repositories-and-dependabot-branches
+
+name: Publish test results
+
+on:
+  workflow_run:
+    workflows: ["CI"]
+    types:
+      - completed
+
+jobs:
+  publish-test-results:
+    name: Publish test results
+    runs-on: ubuntu-latest
+    if: >
+      github.event.workflow_run.conclusion != 'skipped' && (
+        github.event.sender.login == 'dependabot[bot]' ||
+        github.event.workflow_run.head_repository.full_name != github.repository
+      )
+
+    steps:
+      - name: Download and extract artifacts
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+        run: |
+          mkdir artifacts && cd artifacts
+
+          artifacts_url=${{ github.event.workflow_run.artifacts_url }}
+          artifacts=$(gh api $artifacts_url -q '.artifacts[] | {name: .name, url: .archive_download_url}')
+
+          IFS=$'\n'
+          for artifact in $artifacts
+          do
+            name=$(jq -r .name <<<$artifact)
+            url=$(jq -r .url <<<$artifact)
+            gh api $url > "$name.zip"
+            unzip -d "$name" "$name.zip"
+          done
+
+      - name: Publish Unit Test Results
+        uses: EnricoMi/publish-unit-test-result-action@v1
+        with:
+          commit: ${{ github.event.workflow_run.head_sha }}
+          files: "artifacts/**/*.xml"

.github/workflows/sync_linter_versions.py

@@ -2,10 +2,10 @@ name: CI Upstream
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
-      - master
+      - main
   schedule:
     - cron: "0 0 * * *" # Daily “At 00:00” UTC
   workflow_dispatch: # allows you to trigger the workflow run manually

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

@@ -8,16 +8,16 @@ repos:
       - id: check-yaml
   # isort should run before black as black sometimes tweaks the isort output
   - repo: https://github.com/PyCQA/isort
-    rev: 5.8.0
+    rev: 5.9.2
     hooks:
       - id: isort
   # https://github.com/python/black#version-control-integration
   - repo: https://github.com/psf/black
-    rev: 21.6b0
+    rev: 21.7b0
     hooks:
       - id: black
   - repo: https://github.com/keewis/blackdoc
-    rev: v0.3.3
+    rev: v0.3.4
     hooks:
       - id: blackdoc
   - repo: https://gitlab.com/pycqa/flake8
@@ -30,8 +30,7 @@ repos:
   #     - id: velin
   #       args: ["--write", "--compact"]
   - repo: https://github.com/pre-commit/mirrors-mypy
-    # version must correspond to the one in .github/workflows/ci-additional.yaml
-    rev: v0.902
+    rev: v0.910
     hooks:
       - id: mypy
         # Copied from setup.cfg
@@ -44,6 +43,7 @@ repos:
             types-pytz,
             # Dependencies that are typed
             numpy,
+            typing-extensions==3.10.0.0,
           ]
   # run this occasionally, ref discussion https://github.com/pydata/xarray/pull/3194
   # - repo: https://github.com/asottile/pyupgrade

.pre-commit-config.yaml

@@ -13,10 +13,10 @@ upstream        https://github.com/pydata/xarray (push)
 
 <!-- markdownlint-disable MD031 -->
 
- 1. Ensure your master branch is synced to upstream:
+ 1. Ensure your main branch is synced to upstream:
      ```sh
-     git switch master
-     git pull upstream master
+     git switch main
+     git pull upstream main
      ```
  2. Confirm there are no commits on stable that are not yet merged
     ([ref](https://github.com/pydata/xarray/pull/4440)):
@@ -44,9 +44,9 @@ upstream        https://github.com/pydata/xarray (push)
       release.
  6. Open a PR with the release summary and whatsnew changes; in particular the
     release headline should get feedback from the team on what's important to include.
- 7. After merging, again ensure your master branch is synced to upstream:
+ 7. After merging, again ensure your main branch is synced to upstream:
      ```sh
-     git pull upstream master
+     git pull upstream main
      ```
  8. If you have any doubts, run the full test suite one final time!
       ```sh
@@ -59,12 +59,12 @@ upstream        https://github.com/pydata/xarray (push)
 11. This should automatically trigger an upload of the new build to PyPI via GitHub Actions.
     Check this has run [here](https://github.com/pydata/xarray/actions/workflows/pypi-release.yaml),
     and that the version number you expect is displayed [on PyPI](https://pypi.org/project/xarray/)
-12. Update the stable branch (used by ReadTheDocs) and switch back to master:
+12. Update the stable branch (used by ReadTheDocs) and switch back to main:
      ```sh
       git switch stable
-      git rebase master
+      git rebase main
       git push --force upstream stable
-      git switch master
+      git switch main
      ```
     You may need to first fetch it with `git fetch upstream`,
     and check out a local version with `git checkout -b stable upstream/stable`.
@@ -103,12 +103,12 @@ upstream        https://github.com/pydata/xarray (push)
      ~~~~~~~~~~~~~~~~
 
      ```
-14. Commit your changes and push to master again:
+14. Commit your changes and push to main again:
       ```sh
       git commit -am 'New whatsnew section'
-      git push upstream master
+      git push upstream main
       ```
-    You're done pushing to master!
+    You're done pushing to main!
 
 15. Update the docs. Login to <https://readthedocs.org/projects/xray/versions/>
     and switch your new release tag (at the bottom) from "Inactive" to "Active".

HOW_TO_RELEASE.md

@@ -1,9 +1,9 @@
 xarray: N-D labeled arrays and datasets
 =======================================
 
-.. image:: https://github.com/pydata/xarray/workflows/CI/badge.svg?branch=master
+.. image:: https://github.com/pydata/xarray/workflows/CI/badge.svg?branch=main
    :target: https://github.com/pydata/xarray/actions?query=workflow%3ACI
-.. image:: https://codecov.io/gh/pydata/xarray/branch/master/graph/badge.svg
+.. image:: https://codecov.io/gh/pydata/xarray/branch/main/graph/badge.svg
    :target: https://codecov.io/gh/pydata/xarray
 .. image:: https://readthedocs.org/projects/xray/badge/?version=latest
    :target: https://xarray.pydata.org/

README.rst

@@ -15,7 +15,7 @@
 
     // List of branches to benchmark. If not provided, defaults to "master"
     // (for git) or "default" (for mercurial).
-    "branches": ["master"], // for git
+    "branches": ["main"], // for git
     // "branches": ["default"],    // for mercurial
 
     // The DVCS being used.  If not set, it will be automatically

asv_bench/asv.conf.json

@@ -7,6 +7,7 @@ conda uninstall -y --force \
     matplotlib \
     dask \
     distributed \
+    fsspec \
     zarr \
     cftime \
     rasterio \
@@ -40,4 +41,5 @@ python -m pip install \
     git+https://github.com/mapbox/rasterio \
     git+https://github.com/hgrecco/pint \
     git+https://github.com/pydata/bottleneck \
-    git+https://github.com/pydata/sparse
+    git+https://github.com/pydata/sparse \
+    git+https://github.com/intake/filesystem_spec