Merge remote-tracking branch 'upstream/main' into groupby-aggs-using-numpy-groupies

* upstream/main: (23 commits)
  Small typing fix (pydata#6159)
  Drop support for python 3.7 (pydata#5892)
  _season_from_months can now handle np.nan (pydata#5876)
  Use base ImportError not MoudleNotFoundError when trying to see if the (pydata#6154)
  Remove numpy from mypy pre-commit (pydata#6151)
  Change concat dims to be Hashable (pydata#6121)
  Bump pypa/gh-action-pypi-publish from 1.4.2 to 1.5.0 (pydata#6147)
  Remove registration of pandas datetime converter in plotting (pydata#6109)
  Remove pd.Panel checks (pydata#6145)
  Remove paren from DataArray.from_dict docstring (pydata#6140)
  Revert "Deprecate bool(ds) (pydata#6126)" (pydata#6141)
  remove paren from data that is fed to 1D DataArray (pydata#6139)
  Check for just `...`, rather than `[...]` in `da.stack` (pydata#6132)
  DOC: Add "auto" to dataarray `chunk` method (pydata#6068)
  TST: check datetime converter is Matplotlibs (pydata#6128)
  New algorithm for forward filling (pydata#6118)
  Limit and format number of displayed dimensions in repr (pydata#5662)
  Add labels to dataset diagram (pydata#6076)
  Deprecate bool(ds) (pydata#6126)
  Revert "disable pytest-xdist (to check CI failure)" (pydata#6127)
  ...

Author: dcherian

.github/workflows/ci-additional.yaml

@@ -40,10 +40,13 @@ jobs:
         os: ["ubuntu-latest"]
         env:
           [
-            "py37-bare-minimum",
-            "py37-min-all-deps",
-            "py38-all-but-dask",
-            "py38-flaky",
+            # Minimum python version:
+            "py38-bare-minimum",
+            "py38-min-all-deps",
+
+            # Latest python version:
+            "py39-all-but-dask",
+            "py39-flaky",
           ]
     steps:
       - uses: actions/checkout@v2
@@ -52,7 +55,7 @@ jobs:
 
       - name: Set environment variables
         run: |
-          if [[ ${{ matrix.env }} == "py38-flaky" ]] ;
+          if [[ ${{ matrix.env }} == "py39-flaky" ]] ;
           then
             echo "CONDA_ENV_FILE=ci/requirements/environment.yml" >> $GITHUB_ENV
             echo "PYTEST_EXTRA_FLAGS=--run-flaky --run-network-tests" >> $GITHUB_ENV
@@ -75,7 +78,7 @@ jobs:
           mamba-version: "*"
           activate-environment: xarray-tests
           auto-update-conda: false
-          python-version: 3.8
+          python-version: 3.9
           use-only-tar-bz2: true
 
       - name: Install conda dependencies
@@ -96,7 +99,7 @@ jobs:
           python -c "import xarray"
       - name: Run tests
         run: |
-          python -m pytest \
+          python -m pytest -n 4 \
              --cov=xarray \
              --cov-report=xml \
              $PYTEST_EXTRA_FLAGS
@@ -128,7 +131,7 @@ jobs:
           mamba-version: "*"
           activate-environment: xarray-tests
           auto-update-conda: false
-          python-version: "3.8"
+          python-version: "3.9"
 
       - name: Install conda dependencies
         run: |
@@ -164,10 +167,10 @@ jobs:
           channel-priority: strict
           mamba-version: "*"
           auto-update-conda: false
-          python-version: "3.8"
+          python-version: "3.9"
 
       - name: minimum versions policy
         run: |
           mamba install -y pyyaml conda python-dateutil
-          python ci/min_deps_check.py ci/requirements/py37-bare-minimum.yml
-          python ci/min_deps_check.py ci/requirements/py37-min-all-deps.yml
+          python ci/min_deps_check.py ci/requirements/py38-bare-minimum.yml
+          python ci/min_deps_check.py ci/requirements/py38-min-all-deps.yml

.github/workflows/ci.yaml

@@ -38,7 +38,7 @@ jobs:
       matrix:
         os: ["ubuntu-latest", "macos-latest", "windows-latest"]
         # Bookend python versions
-        python-version: ["3.7", "3.9"]
+        python-version: ["3.8", "3.9"]
     steps:
       - uses: actions/checkout@v2
         with:
@@ -87,7 +87,7 @@ jobs:
         run: |
           python -c "import xarray"
       - name: Run tests
-        run: python -m pytest
+        run: python -m pytest -n 4
           --cov=xarray
           --cov-report=xml
           --junitxml=pytest.xml

.github/workflows/pypi-release.yaml

@@ -64,7 +64,7 @@ jobs:
           ls -ltrh dist
       - name: Publish package to TestPyPI
         if: github.event_name == 'push'
-        uses: pypa/gh-action-pypi-publish@v1.4.2
+        uses: pypa/gh-action-pypi-publish@v1.5.0
         with:
           user: __token__
           password: ${{ secrets.TESTPYPI_TOKEN }}
@@ -89,7 +89,7 @@ jobs:
           name: releases
           path: dist
       - name: Publish package to PyPI
-        uses: pypa/gh-action-pypi-publish@v1.4.2
+        uses: pypa/gh-action-pypi-publish@v1.5.0
         with:
           user: __token__
           password: ${{ secrets.PYPI_TOKEN }}

.pre-commit-config.yaml

@@ -32,7 +32,7 @@ repos:
   #     - id: velin
   #       args: ["--write", "--compact"]
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.930
+    rev: v0.931
     hooks:
       - id: mypy
         # `properies` & `asv_bench` are copied from setup.cfg.
@@ -45,8 +45,6 @@ repos:
             types-PyYAML,
             types-pytz,
             typing-extensions==3.10.0.0,
-            # Dependencies that are typed
-            numpy,
           ]
   # run this occasionally, ref discussion https://github.com/pydata/xarray/pull/3194
   # - repo: https://github.com/asottile/pyupgrade

ci/requirements/environment-windows.yml

@@ -37,7 +37,6 @@ dependencies:
   - rasterio
   - scipy
   - seaborn
-  - setuptools
   - sparse
   - toolz
   - typing_extensions

ci/requirements/environment.yml

@@ -41,7 +41,6 @@ dependencies:
   - rasterio
   - scipy
   - seaborn
-  - setuptools
   - sparse
   - toolz
   - typing_extensions

ci/requirements/py37-bare-minimum.yml renamed to ci/requirements/py38-bare-minimum.yml

@@ -3,7 +3,7 @@ channels:
   - conda-forge
   - nodefaults
 dependencies:
-  - python=3.7
+  - python=3.8
   - coveralls
   - pip
   - pytest
@@ -12,5 +12,3 @@ dependencies:
   - pytest-xdist
   - numpy=1.18
   - pandas=1.1
-  - typing_extensions=3.7
-  - importlib-metadata=2.0

ci/requirements/py37-min-all-deps.yml renamed to ci/requirements/py38-min-all-deps.yml

@@ -7,7 +7,7 @@ dependencies:
   # Run ci/min_deps_check.py to verify that this file respects the policy.
   # When upgrading python, numpy, or pandas, must also change
   # doc/installing.rst and setup.py.
-  - python=3.7
+  - python=3.8
   - boto3=1.13
   - bottleneck=1.3
   # cartopy 0.18 conflicts with pynio
@@ -24,7 +24,6 @@ dependencies:
   - hdf5=1.10
   - hypothesis
   - iris=2.4
-  - importlib-metadata=2.0
   - lxml=4.6  # Optional dep of pydap
   - matplotlib-base=3.3
   - nc-time-axis=1.2

ci/requirements/py38-all-but-dask.yml renamed to ci/requirements/py39-all-but-dask.yml

@@ -3,7 +3,7 @@ channels:
   - conda-forge
   - nodefaults
 dependencies:
-  - python=3.8
+  - python=3.9
   - black
   - aiobotocore
   - boto3
@@ -38,7 +38,6 @@ dependencies:
   - rasterio
   - scipy
   - seaborn
-  - setuptools
   - sparse
   - toolz
   - typing_extensions