From f2d0eb49b06f216117f048287e0796c1b6fd0a1d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Apr 2022 09:09:44 -0600
Subject: [PATCH 01/20] Bump codecov/codecov-action from 3.0.0 to 3.1.0 (#6509)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/ci-additional.yaml | 2 +-
 .github/workflows/ci.yaml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml
index f2542ab52d5..c43dd1ad46a 100644
--- a/.github/workflows/ci-additional.yaml
+++ b/.github/workflows/ci-additional.yaml
@@ -109,7 +109,7 @@ jobs:
              $PYTEST_EXTRA_FLAGS
 
       - name: Upload code coverage to Codecov
-        uses: codecov/codecov-action@v3.0.0
+        uses: codecov/codecov-action@v3.1.0
         with:
           file: ./coverage.xml
           flags: unittests,${{ matrix.env }}
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index a5c1a2de5ad..0f8073c017b 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -104,7 +104,7 @@ jobs:
           path: pytest.xml
 
       - name: Upload code coverage to Codecov
-        uses: codecov/codecov-action@v3.0.0
+        uses: codecov/codecov-action@v3.1.0
         with:
           file: ./coverage.xml
           flags: unittests

From e13eff216dcdcc5144ee2e03eb5ae9c1585599ac Mon Sep 17 00:00:00 2001
From: Maximilian Roos <5635139+max-sixty@users.noreply.github.com>
Date: Tue, 26 Apr 2022 17:54:43 -0700
Subject: [PATCH 02/20] Add a badge for binder (#6518)

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 57a68d42192..be5edb15ac0 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,7 @@
 [![image](https://img.shields.io/pypi/v/xarray.svg)](https://pypi.python.org/pypi/xarray/)
 [![image](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/python/black)
 [![image](https://zenodo.org/badge/DOI/10.5281/zenodo.598201.svg)](https://doi.org/10.5281/zenodo.598201)
+[![badge](https://img.shields.io/badge/launch-binder-579ACA.svg?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFkAAABZCAMAAABi1XidAAAB8lBMVEX///9XmsrmZYH1olJXmsr1olJXmsrmZYH1olJXmsr1olJXmsrmZYH1olL1olJXmsr1olJXmsrmZYH1olL1olJXmsrmZYH1olJXmsr1olL1olJXmsrmZYH1olL1olJXmsrmZYH1olL1olL0nFf1olJXmsrmZYH1olJXmsq8dZb1olJXmsrmZYH1olJXmspXmspXmsr1olL1olJXmsrmZYH1olJXmsr1olL1olJXmsrmZYH1olL1olLeaIVXmsrmZYH1olL1olL1olJXmsrmZYH1olLna31Xmsr1olJXmsr1olJXmsrmZYH1olLqoVr1olJXmsr1olJXmsrmZYH1olL1olKkfaPobXvviGabgadXmsqThKuofKHmZ4Dobnr1olJXmsr1olJXmspXmsr1olJXmsrfZ4TuhWn1olL1olJXmsqBi7X1olJXmspZmslbmMhbmsdemsVfl8ZgmsNim8Jpk8F0m7R4m7F5nLB6jbh7jbiDirOEibOGnKaMhq+PnaCVg6qWg6qegKaff6WhnpKofKGtnomxeZy3noG6dZi+n3vCcpPDcpPGn3bLb4/Mb47UbIrVa4rYoGjdaIbeaIXhoWHmZYHobXvpcHjqdHXreHLroVrsfG/uhGnuh2bwj2Hxk17yl1vzmljzm1j0nlX1olL3AJXWAAAAbXRSTlMAEBAQHx8gICAuLjAwMDw9PUBAQEpQUFBXV1hgYGBkcHBwcXl8gICAgoiIkJCQlJicnJ2goKCmqK+wsLC4usDAwMjP0NDQ1NbW3Nzg4ODi5+3v8PDw8/T09PX29vb39/f5+fr7+/z8/Pz9/v7+zczCxgAABC5JREFUeAHN1ul3k0UUBvCb1CTVpmpaitAGSLSpSuKCLWpbTKNJFGlcSMAFF63iUmRccNG6gLbuxkXU66JAUef/9LSpmXnyLr3T5AO/rzl5zj137p136BISy44fKJXuGN/d19PUfYeO67Znqtf2KH33Id1psXoFdW30sPZ1sMvs2D060AHqws4FHeJojLZqnw53cmfvg+XR8mC0OEjuxrXEkX5ydeVJLVIlV0e10PXk5k7dYeHu7Cj1j+49uKg7uLU61tGLw1lq27ugQYlclHC4bgv7VQ+TAyj5Zc/UjsPvs1sd5cWryWObtvWT2EPa4rtnWW3JkpjggEpbOsPr7F7EyNewtpBIslA7p43HCsnwooXTEc3UmPmCNn5lrqTJxy6nRmcavGZVt/3Da2pD5NHvsOHJCrdc1G2r3DITpU7yic7w/7Rxnjc0kt5GC4djiv2Sz3Fb2iEZg41/ddsFDoyuYrIkmFehz0HR2thPgQqMyQYb2OtB0WxsZ3BeG3+wpRb1vzl2UYBog8FfGhttFKjtAclnZYrRo9ryG9uG/FZQU4AEg8ZE9LjGMzTmqKXPLnlWVnIlQQTvxJf8ip7VgjZjyVPrjw1te5otM7RmP7xm+sK2Gv9I8Gi++BRbEkR9EBw8zRUcKxwp73xkaLiqQb+kGduJTNHG72zcW9LoJgqQxpP3/Tj//c3yB0tqzaml05/+orHLksVO+95kX7/7qgJvnjlrfr2Ggsyx0eoy9uPzN5SPd86aXggOsEKW2Prz7du3VID3/tzs/sSRs2w7ovVHKtjrX2pd7ZMlTxAYfBAL9jiDwfLkq55Tm7ifhMlTGPyCAs7RFRhn47JnlcB9RM5T97ASuZXIcVNuUDIndpDbdsfrqsOppeXl5Y+XVKdjFCTh+zGaVuj0d9zy05PPK3QzBamxdwtTCrzyg/2Rvf2EstUjordGwa/kx9mSJLr8mLLtCW8HHGJc2R5hS219IiF6PnTusOqcMl57gm0Z8kanKMAQg0qSyuZfn7zItsbGyO9QlnxY0eCuD1XL2ys/MsrQhltE7Ug0uFOzufJFE2PxBo/YAx8XPPdDwWN0MrDRYIZF0mSMKCNHgaIVFoBbNoLJ7tEQDKxGF0kcLQimojCZopv0OkNOyWCCg9XMVAi7ARJzQdM2QUh0gmBozjc3Skg6dSBRqDGYSUOu66Zg+I2fNZs/M3/f/Grl/XnyF1Gw3VKCez0PN5IUfFLqvgUN4C0qNqYs5YhPL+aVZYDE4IpUk57oSFnJm4FyCqqOE0jhY2SMyLFoo56zyo6becOS5UVDdj7Vih0zp+tcMhwRpBeLyqtIjlJKAIZSbI8SGSF3k0pA3mR5tHuwPFoa7N7reoq2bqCsAk1HqCu5uvI1n6JuRXI+S1Mco54YmYTwcn6Aeic+kssXi8XpXC4V3t7/ADuTNKaQJdScAAAAAElFTkSuQmCC)](https://mybinder.org/v2/gh/pydata/xarray/main?urlpath=lab/tree/doc/examples/weather-data.ipynb)
 [![image](https://img.shields.io/twitter/follow/xarray_dev?style=social)](https://twitter.com/xarray_dev)
 
 **xarray** (formerly **xray**) is an open source project and Python

From 819573208e144640bf4ff7a13d5b2cc08b8e3ef7 Mon Sep 17 00:00:00 2001
From: Blair Bonnett <blair.bonnett@gmail.com>
Date: Wed, 27 Apr 2022 03:07:50 +0200
Subject: [PATCH 03/20] Use new importlib.metadata.entry_points interface where
 available. (#6516)

With Python 3.10, the entry_points() method returning a SelectableGroups
dict interface was deprecated. The preferred way is to now filter by
group through a keyword argument.

Fixes GH6514.
---
 xarray/backends/plugins.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/xarray/backends/plugins.py b/xarray/backends/plugins.py
index 7444fbf11eb..44953b875d9 100644
--- a/xarray/backends/plugins.py
+++ b/xarray/backends/plugins.py
@@ -1,6 +1,7 @@
 import functools
 import inspect
 import itertools
+import sys
 import warnings
 from importlib.metadata import entry_points
 
@@ -95,7 +96,11 @@ def build_engines(entrypoints):
 
 @functools.lru_cache(maxsize=1)
 def list_engines():
-    entrypoints = entry_points().get("xarray.backends", ())
+    # New selection mechanism introduced with Python 3.10. See GH6514.
+    if sys.version_info >= (3, 10):
+        entrypoints = entry_points(group="xarray.backends")
+    else:
+        entrypoints = entry_points().get("xarray.backends", ())
     return build_engines(entrypoints)
 
 

From d274a46e2fcc5c6f2448aebceed5daa502cc8462 Mon Sep 17 00:00:00 2001
From: Maximilian Roos <5635139+max-sixty@users.noreply.github.com>
Date: Tue, 26 Apr 2022 19:32:43 -0700
Subject: [PATCH 04/20] Scale numfocus image in readme (#6519)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index be5edb15ac0..0df9e7d1bac 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,7 @@ page](https://docs.xarray.dev/en/latest/contributing.html#).
 
 ## NumFOCUS
 
-[![image](https://numfocus.org/wp-content/uploads/2017/07/NumFocus_LRG.png)](https://numfocus.org/)
+<img src="https://numfocus.org/wp-content/uploads/2017/07/NumFocus_LRG.png" width="200" href="https://numfocus.org/">
 
 Xarray is a fiscally sponsored project of
 [NumFOCUS](https://numfocus.org), a nonprofit dedicated to supporting

From 7173bd3f6b76e92f77f4156236fd2b3fe546c9c2 Mon Sep 17 00:00:00 2001
From: Maximilian Roos <5635139+max-sixty@users.noreply.github.com>
Date: Wed, 27 Apr 2022 01:17:00 -0700
Subject: [PATCH 05/20] Pin version of black in pre-commit blackdoc (#6492)

---
 .pre-commit-config.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index be87d823c98..d4ce6ebc523 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -35,6 +35,7 @@ repos:
     hooks:
       - id: blackdoc
         exclude: "generate_reductions.py"
+        additional_dependencies: ["black==22.3.0"]
   - repo: https://github.com/PyCQA/flake8
     rev: 4.0.1
     hooks:

From 1941695ade6a3e4e46a07e6604f29bda5176de26 Mon Sep 17 00:00:00 2001
From: Maximilian Roos <5635139+max-sixty@users.noreply.github.com>
Date: Wed, 27 Apr 2022 19:17:53 -0700
Subject: [PATCH 06/20] Fix some mypy issues (#6531)

* Fix some mypy issues

Unfortunately these have crept back in. I'll add a workflow job, since the pre-commit is not covering everything on its own

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Add mypy workflow

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 .github/workflows/ci-additional.yaml | 41 +++++++++++++--
 xarray/core/dataarray.py             |  5 +-
 xarray/core/dataset.py               |  6 ++-
 xarray/core/indexing.py              | 76 ++++++++++++----------------
 xarray/core/utils.py                 |  3 +-
 xarray/tests/test_coding_times.py    | 10 ++--
 xarray/tests/test_formatting.py      |  6 +--
 7 files changed, 86 insertions(+), 61 deletions(-)

diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml
index c43dd1ad46a..afc7e9c7ceb 100644
--- a/.github/workflows/ci-additional.yaml
+++ b/.github/workflows/ci-additional.yaml
@@ -42,8 +42,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest"]
-        env:
-          [
+        env: [
             # Minimum python version:
             "py38-bare-minimum",
             "py38-min-all-deps",
@@ -71,8 +70,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/conda_pkgs_dir
-          key:
-            ${{ runner.os }}-conda-${{ matrix.env }}-${{
+          key: ${{ runner.os }}-conda-${{ matrix.env }}-${{
             hashFiles('ci/requirements/**.yml') }}
 
       - uses: conda-incubator/setup-miniconda@v2
@@ -152,6 +150,41 @@ jobs:
         run: |
           python -m pytest --doctest-modules xarray --ignore xarray/tests
 
+  mypy:
+    name: Mypy
+    runs-on: "ubuntu-latest"
+    if: needs.detect-ci-trigger.outputs.triggered == 'false'
+    defaults:
+      run:
+        shell: bash -l {0}
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0 # Fetch all history for all branches and tags.
+      - uses: conda-incubator/setup-miniconda@v2
+        with:
+          channels: conda-forge
+          channel-priority: strict
+          mamba-version: "*"
+          activate-environment: xarray-tests
+          auto-update-conda: false
+          python-version: "3.9"
+
+      - name: Install conda dependencies
+        run: |
+          mamba env update -f ci/requirements/environment.yml
+      - 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: Run mypy
+        run: mypy
+
   min-version-policy:
     name: Minimum Version Policy
     runs-on: "ubuntu-latest"
diff --git a/xarray/core/dataarray.py b/xarray/core/dataarray.py
index 2cf78fa7c61..d15cbd00c0d 100644
--- a/xarray/core/dataarray.py
+++ b/xarray/core/dataarray.py
@@ -1154,7 +1154,8 @@ def chunk(
             chunks = {}
 
         if isinstance(chunks, (float, str, int)):
-            chunks = dict.fromkeys(self.dims, chunks)
+            # ignoring type; unclear why it won't accept a Literal into the value.
+            chunks = dict.fromkeys(self.dims, chunks)  # type: ignore
         elif isinstance(chunks, (tuple, list)):
             chunks = dict(zip(self.dims, chunks))
         else:
@@ -4735,7 +4736,7 @@ def curvefit(
 
     def drop_duplicates(
         self,
-        dim: Hashable | Iterable[Hashable] | ...,
+        dim: Hashable | Iterable[Hashable],
         keep: Literal["first", "last"] | Literal[False] = "first",
     ):
         """Returns a new DataArray with duplicate dimension values removed.
diff --git a/xarray/core/dataset.py b/xarray/core/dataset.py
index 2c67cd665ca..76776b4bc44 100644
--- a/xarray/core/dataset.py
+++ b/xarray/core/dataset.py
@@ -7981,7 +7981,7 @@ def _wrapper(Y, *coords_, **kwargs):
 
     def drop_duplicates(
         self,
-        dim: Hashable | Iterable[Hashable] | ...,
+        dim: Hashable | Iterable[Hashable],
         keep: Literal["first", "last"] | Literal[False] = "first",
     ):
         """Returns a new Dataset with duplicate dimension values removed.
@@ -8005,9 +8005,11 @@ def drop_duplicates(
         DataArray.drop_duplicates
         """
         if isinstance(dim, str):
-            dims = (dim,)
+            dims: Iterable = (dim,)
         elif dim is ...:
             dims = self.dims
+        elif not isinstance(dim, Iterable):
+            dims = [dim]
         else:
             dims = dim
 
diff --git a/xarray/core/indexing.py b/xarray/core/indexing.py
index 27bd4954bc4..cbbd507eeff 100644
--- a/xarray/core/indexing.py
+++ b/xarray/core/indexing.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import enum
 import functools
 import operator
@@ -6,19 +8,7 @@
 from dataclasses import dataclass, field
 from datetime import timedelta
 from html import escape
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Callable,
-    Dict,
-    Hashable,
-    Iterable,
-    List,
-    Mapping,
-    Optional,
-    Tuple,
-    Union,
-)
+from typing import TYPE_CHECKING, Any, Callable, Hashable, Iterable, Mapping
 
 import numpy as np
 import pandas as pd
@@ -59,12 +49,12 @@ class IndexSelResult:
 
     """
 
-    dim_indexers: Dict[Any, Any]
-    indexes: Dict[Any, "Index"] = field(default_factory=dict)
-    variables: Dict[Any, "Variable"] = field(default_factory=dict)
-    drop_coords: List[Hashable] = field(default_factory=list)
-    drop_indexes: List[Hashable] = field(default_factory=list)
-    rename_dims: Dict[Any, Hashable] = field(default_factory=dict)
+    dim_indexers: dict[Any, Any]
+    indexes: dict[Any, Index] = field(default_factory=dict)
+    variables: dict[Any, Variable] = field(default_factory=dict)
+    drop_coords: list[Hashable] = field(default_factory=list)
+    drop_indexes: list[Hashable] = field(default_factory=list)
+    rename_dims: dict[Any, Hashable] = field(default_factory=dict)
 
     def as_tuple(self):
         """Unlike ``dataclasses.astuple``, return a shallow copy.
@@ -82,7 +72,7 @@ def as_tuple(self):
         )
 
 
-def merge_sel_results(results: List[IndexSelResult]) -> IndexSelResult:
+def merge_sel_results(results: list[IndexSelResult]) -> IndexSelResult:
     all_dims_count = Counter([dim for res in results for dim in res.dim_indexers])
     duplicate_dims = {k: v for k, v in all_dims_count.items() if v > 1}
 
@@ -124,13 +114,13 @@ def group_indexers_by_index(
     obj: T_Xarray,
     indexers: Mapping[Any, Any],
     options: Mapping[str, Any],
-) -> List[Tuple["Index", Dict[Any, Any]]]:
+) -> list[tuple[Index, dict[Any, Any]]]:
     """Returns a list of unique indexes and their corresponding indexers."""
     unique_indexes = {}
-    grouped_indexers: Mapping[Union[int, None], Dict] = defaultdict(dict)
+    grouped_indexers: Mapping[int | None, dict] = defaultdict(dict)
 
     for key, label in indexers.items():
-        index: "Index" = obj.xindexes.get(key, None)
+        index: Index = obj.xindexes.get(key, None)
 
         if index is not None:
             index_id = id(index)
@@ -787,7 +777,7 @@ class IndexingSupport(enum.Enum):
 
 def explicit_indexing_adapter(
     key: ExplicitIndexer,
-    shape: Tuple[int, ...],
+    shape: tuple[int, ...],
     indexing_support: IndexingSupport,
     raw_indexing_method: Callable,
 ) -> Any:
@@ -821,8 +811,8 @@ def explicit_indexing_adapter(
 
 
 def decompose_indexer(
-    indexer: ExplicitIndexer, shape: Tuple[int, ...], indexing_support: IndexingSupport
-) -> Tuple[ExplicitIndexer, ExplicitIndexer]:
+    indexer: ExplicitIndexer, shape: tuple[int, ...], indexing_support: IndexingSupport
+) -> tuple[ExplicitIndexer, ExplicitIndexer]:
     if isinstance(indexer, VectorizedIndexer):
         return _decompose_vectorized_indexer(indexer, shape, indexing_support)
     if isinstance(indexer, (BasicIndexer, OuterIndexer)):
@@ -848,9 +838,9 @@ def _decompose_slice(key, size):
 
 def _decompose_vectorized_indexer(
     indexer: VectorizedIndexer,
-    shape: Tuple[int, ...],
+    shape: tuple[int, ...],
     indexing_support: IndexingSupport,
-) -> Tuple[ExplicitIndexer, ExplicitIndexer]:
+) -> tuple[ExplicitIndexer, ExplicitIndexer]:
     """
     Decompose vectorized indexer to the successive two indexers, where the
     first indexer will be used to index backend arrays, while the second one
@@ -929,10 +919,10 @@ def _decompose_vectorized_indexer(
 
 
 def _decompose_outer_indexer(
-    indexer: Union[BasicIndexer, OuterIndexer],
-    shape: Tuple[int, ...],
+    indexer: BasicIndexer | OuterIndexer,
+    shape: tuple[int, ...],
     indexing_support: IndexingSupport,
-) -> Tuple[ExplicitIndexer, ExplicitIndexer]:
+) -> tuple[ExplicitIndexer, ExplicitIndexer]:
     """
     Decompose outer indexer to the successive two indexers, where the
     first indexer will be used to index backend arrays, while the second one
@@ -973,7 +963,7 @@ def _decompose_outer_indexer(
         return indexer, BasicIndexer(())
     assert isinstance(indexer, (OuterIndexer, BasicIndexer))
 
-    backend_indexer: List[Any] = []
+    backend_indexer: list[Any] = []
     np_indexer = []
     # make indexer positive
     pos_indexer: list[np.ndarray | int | np.number] = []
@@ -1395,7 +1385,7 @@ def __array__(self, dtype: DTypeLike = None) -> np.ndarray:
         return np.asarray(array.values, dtype=dtype)
 
     @property
-    def shape(self) -> Tuple[int]:
+    def shape(self) -> tuple[int]:
         return (len(self.array),)
 
     def _convert_scalar(self, item):
@@ -1420,13 +1410,13 @@ def _convert_scalar(self, item):
 
     def __getitem__(
         self, indexer
-    ) -> Union[
-        "PandasIndexingAdapter",
-        NumpyIndexingAdapter,
-        np.ndarray,
-        np.datetime64,
-        np.timedelta64,
-    ]:
+    ) -> (
+        PandasIndexingAdapter
+        | NumpyIndexingAdapter
+        | np.ndarray
+        | np.datetime64
+        | np.timedelta64
+    ):
         key = indexer.tuple
         if isinstance(key, tuple) and len(key) == 1:
             # unpack key so it can index a pandas.Index object (pandas.Index
@@ -1449,7 +1439,7 @@ def transpose(self, order) -> pd.Index:
     def __repr__(self) -> str:
         return f"{type(self).__name__}(array={self.array!r}, dtype={self.dtype!r})"
 
-    def copy(self, deep: bool = True) -> "PandasIndexingAdapter":
+    def copy(self, deep: bool = True) -> PandasIndexingAdapter:
         # Not the same as just writing `self.array.copy(deep=deep)`, as
         # shallow copies of the underlying numpy.ndarrays become deep ones
         # upon pickling
@@ -1476,7 +1466,7 @@ def __init__(
         self,
         array: pd.MultiIndex,
         dtype: DTypeLike = None,
-        level: Optional[str] = None,
+        level: str | None = None,
     ):
         super().__init__(array, dtype)
         self.level = level
@@ -1535,7 +1525,7 @@ def _repr_html_(self) -> str:
         array_repr = short_numpy_repr(self._get_array_subset())
         return f"<pre>{escape(array_repr)}</pre>"
 
-    def copy(self, deep: bool = True) -> "PandasMultiIndexingAdapter":
+    def copy(self, deep: bool = True) -> PandasMultiIndexingAdapter:
         # see PandasIndexingAdapter.copy
         array = self.array.copy(deep=True) if deep else self.array
         return type(self)(array, self._dtype, self.level)
diff --git a/xarray/core/utils.py b/xarray/core/utils.py
index efdbe10d5ef..bab6476e734 100644
--- a/xarray/core/utils.py
+++ b/xarray/core/utils.py
@@ -237,7 +237,8 @@ def remove_incompatible_items(
             del first_dict[k]
 
 
-def is_dict_like(value: Any) -> bool:
+# It's probably OK to give this as a TypeGuard; though it's not perfectly robust.
+def is_dict_like(value: Any) -> TypeGuard[dict]:
     return hasattr(value, "keys") and hasattr(value, "__getitem__")
 
 
diff --git a/xarray/tests/test_coding_times.py b/xarray/tests/test_coding_times.py
index 92d27f22eb8..f10523aecbb 100644
--- a/xarray/tests/test_coding_times.py
+++ b/xarray/tests/test_coding_times.py
@@ -1007,12 +1007,9 @@ def test_decode_ambiguous_time_warns(calendar) -> None:
     units = "days since 1-1-1"
     expected = num2date(dates, units, calendar=calendar, only_use_cftime_datetimes=True)
 
-    exp_warn_type = SerializationWarning if is_standard_calendar else None
-
-    with pytest.warns(exp_warn_type) as record:
-        result = decode_cf_datetime(dates, units, calendar=calendar)
-
     if is_standard_calendar:
+        with pytest.warns(SerializationWarning) as record:
+            result = decode_cf_datetime(dates, units, calendar=calendar)
         relevant_warnings = [
             r
             for r in record.list
@@ -1020,7 +1017,8 @@ def test_decode_ambiguous_time_warns(calendar) -> None:
         ]
         assert len(relevant_warnings) == 1
     else:
-        assert not record
+        with assert_no_warnings():
+            result = decode_cf_datetime(dates, units, calendar=calendar)
 
     np.testing.assert_array_equal(result, expected)
 
diff --git a/xarray/tests/test_formatting.py b/xarray/tests/test_formatting.py
index efdb8a57288..4bbf41c7b38 100644
--- a/xarray/tests/test_formatting.py
+++ b/xarray/tests/test_formatting.py
@@ -480,10 +480,10 @@ def test_short_numpy_repr() -> None:
         assert num_lines < 30
 
     # threshold option (default: 200)
-    array = np.arange(100)
-    assert "..." not in formatting.short_numpy_repr(array)
+    array2 = np.arange(100)
+    assert "..." not in formatting.short_numpy_repr(array2)
     with xr.set_options(display_values_threshold=10):
-        assert "..." in formatting.short_numpy_repr(array)
+        assert "..." in formatting.short_numpy_repr(array2)
 
 
 def test_large_array_repr_length() -> None:

From 5bc311a070b67f1ef54cba7b435df1470b89929c Mon Sep 17 00:00:00 2001
From: Maximilian Roos <5635139+max-sixty@users.noreply.github.com>
Date: Wed, 27 Apr 2022 20:17:22 -0700
Subject: [PATCH 07/20] Restrict annotations to a single run in GHA (#6532)

* Restrict annotations to a single run in GHA
---
 .github/workflows/ci.yaml       | 7 +++++++
 ci/requirements/environment.yml | 1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 0f8073c017b..d81e710dc2e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -78,6 +78,13 @@ jobs:
         run: |
           mamba env update -f $CONDA_ENV_FILE
 
+      # We only want to install this on one run, because otherwise we'll have
+      # duplicate annotations.
+      - name: Install error reporter
+        if: ${{ matrix.os }} == 'ubuntu-latest' and ${{ matrix.python-version }} == '3.10'
+        run: |
+          python -m pip install pytest-github-actions-annotate-failures
+
       - name: Install xarray
         run: |
           python -m pip install --no-deps -e .
diff --git a/ci/requirements/environment.yml b/ci/requirements/environment.yml
index 9269a70badf..516c964afc7 100644
--- a/ci/requirements/environment.yml
+++ b/ci/requirements/environment.yml
@@ -37,7 +37,6 @@ dependencies:
   - pytest
   - pytest-cov
   - pytest-env
-  - pytest-github-actions-annotate-failures
   - pytest-xdist
   - rasterio
   - scipy

From 1c7901894a5719a38c4d9dc50d6dad32bf87ded4 Mon Sep 17 00:00:00 2001
From: Maximilian Roos <5635139+max-sixty@users.noreply.github.com>
Date: Wed, 27 Apr 2022 23:29:27 -0700
Subject: [PATCH 08/20] Attempt to consolidate tests in CI (#6533)

* Attempt to consolidate tests in CI
---
 .github/workflows/ci-additional.yaml |  3 +++
 .github/workflows/ci.yaml            | 29 +++++++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml
index afc7e9c7ceb..5d44a892485 100644
--- a/.github/workflows/ci-additional.yaml
+++ b/.github/workflows/ci-additional.yaml
@@ -30,6 +30,9 @@ jobs:
         with:
           keyword: "[skip-ci]"
 
+  # This job is deprecated and can be removed soon. It's still here in case the
+  # move consolidate with `ci.yaml` missed something which the existing test
+  # picks up.
   test:
     name: ${{ matrix.os }} ${{ matrix.env }}
     runs-on: ${{ matrix.os }}
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d81e710dc2e..57ec914f877 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -43,6 +43,21 @@ jobs:
         os: ["ubuntu-latest", "macos-latest", "windows-latest"]
         # Bookend python versions
         python-version: ["3.8", "3.10"]
+        include:
+          # Minimum python version:
+          - env: "py38-bare-minimum"
+            python-version: 3.8
+            os: ubuntu-latest
+          - env: "py38-min-all-deps"
+            python-version: 3.8
+            os: ubuntu-latest
+          # Latest python version:
+          - env: "py39-all-but-dask"
+            python-version: 3.9
+            os: ubuntu-latest
+          - env: "py39-flaky"
+            python-version: 3.9
+            os: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:
@@ -52,10 +67,19 @@ jobs:
           if [[ ${{ matrix.os }} == windows* ]] ;
           then
             echo "CONDA_ENV_FILE=ci/requirements/environment-windows.yml" >> $GITHUB_ENV
+          elif [[ "${{ matrix.env }}" != "" ]] ;
+          then
+            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
+            else
+              echo "CONDA_ENV_FILE=ci/requirements/${{ matrix.env }}.yml" >> $GITHUB_ENV
+            fi
           else
             echo "CONDA_ENV_FILE=ci/requirements/environment.yml" >> $GITHUB_ENV
-
           fi
+
           echo "PYTHON_VERSION=${{ matrix.python-version }}" >> $GITHUB_ENV
 
       - name: Cache conda
@@ -94,14 +118,17 @@ jobs:
           conda info -a
           conda list
           python xarray/util/print_versions.py
+
       - name: Import xarray
         run: |
           python -c "import xarray"
+
       - name: Run tests
         run: python -m pytest -n 4
           --cov=xarray
           --cov-report=xml
           --junitxml=pytest.xml
+          $PYTEST_EXTRA_FLAGS
 
       - name: Upload test results
         if: always()

From 8cf9e57127e4ff8ff0efe1cb15c5fedc107a82bf Mon Sep 17 00:00:00 2001
From: Maximilian Roos <5635139+max-sixty@users.noreply.github.com>
Date: Wed, 27 Apr 2022 23:30:25 -0700
Subject: [PATCH 09/20] Attempt to improve CI caching (#6534)

* Attempt to improve CI caching

Currently about 40% of the time is taken by installing things, hopefully we can cut that down

* Update .github/workflows/ci.yaml

Co-authored-by: Deepak Cherian <dcherian@users.noreply.github.com>

* Update .github/workflows/ci.yaml

* Fix some mypy issues (#6531)

* Fix some mypy issues

Unfortunately these have crept back in. I'll add a workflow job, since the pre-commit is not covering everything on its own

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Add mypy workflow

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Revert "Update .github/workflows/ci.yaml"

This reverts commit 73a99327733906ddbde33bd6547a1ba517bc9e9f.

* hard-code env path

Co-authored-by: Deepak Cherian <dcherian@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 .github/workflows/ci-additional.yaml |  1 +
 .github/workflows/ci.yaml            | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml
index 5d44a892485..323875aecc5 100644
--- a/.github/workflows/ci-additional.yaml
+++ b/.github/workflows/ci-additional.yaml
@@ -69,6 +69,7 @@ jobs:
           else
             echo "CONDA_ENV_FILE=ci/requirements/${{ matrix.env }}.yml" >> $GITHUB_ENV
           fi
+
       - name: Cache conda
         uses: actions/cache@v3
         with:
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 57ec914f877..53db5d9066d 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -82,12 +82,15 @@ jobs:
 
           echo "PYTHON_VERSION=${{ matrix.python-version }}" >> $GITHUB_ENV
 
+        # This and the next few are based on https://github.com/conda-incubator/setup-miniconda#caching-environments
       - name: Cache conda
+        id: cache-conda
         uses: actions/cache@v3
         with:
           path: ~/conda_pkgs_dir
           key: ${{ runner.os }}-conda-py${{ matrix.python-version }}-${{
             hashFiles('ci/requirements/**.yml') }}
+
       - uses: conda-incubator/setup-miniconda@v2
         with:
           channels: conda-forge
@@ -98,9 +101,18 @@ jobs:
           python-version: ${{ matrix.python-version }}
           use-only-tar-bz2: true
 
+      - name: Cache conda env
+        id: cache-env
+        uses: actions/cache@v3
+        with:
+          path: /usr/share/miniconda/envs/xarray-tests
+          key: ${{ runner.os }}-conda-py${{ matrix.python-version }}-${{
+            hashFiles('ci/requirements/**.yml') }}
+
       - name: Install conda dependencies
         run: |
           mamba env update -f $CONDA_ENV_FILE
+        if: steps.cache-env.outputs.cache-hit != 'true'
 
       # We only want to install this on one run, because otherwise we'll have
       # duplicate annotations.

From 8e4af267478e0de3cc1bb21d4d776d4d29ca626f Mon Sep 17 00:00:00 2001
From: Maximilian Roos <5635139+max-sixty@users.noreply.github.com>
Date: Thu, 28 Apr 2022 00:33:03 -0700
Subject: [PATCH 10/20] Fix doctest & mypy CI jobs (#6535)

* Fix doctest & mypy CI jobs
---
 .github/workflows/ci-additional.yaml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml
index 323875aecc5..0b4e0f185c7 100644
--- a/.github/workflows/ci-additional.yaml
+++ b/.github/workflows/ci-additional.yaml
@@ -121,6 +121,7 @@ jobs:
   doctest:
     name: Doctests
     runs-on: "ubuntu-latest"
+    needs: detect-ci-trigger
     if: needs.detect-ci-trigger.outputs.triggered == 'false'
     defaults:
       run:
@@ -157,6 +158,7 @@ jobs:
   mypy:
     name: Mypy
     runs-on: "ubuntu-latest"
+    needs: detect-ci-trigger
     if: needs.detect-ci-trigger.outputs.triggered == 'false'
     defaults:
       run:
@@ -186,8 +188,13 @@ jobs:
           conda info -a
           conda list
           python xarray/util/print_versions.py
+      - name: Install mypy
+        run: |
+          python -m pip install mypy
+          python -m mypy --install-types --non-interactive
+
       - name: Run mypy
-        run: mypy
+        run: python -m mypy
 
   min-version-policy:
     name: Minimum Version Policy

From e0cc0514587e3fb5725433050dcbfd6bcec62c7a Mon Sep 17 00:00:00 2001
From: Maximilian Roos <5635139+max-sixty@users.noreply.github.com>
Date: Thu, 28 Apr 2022 00:35:34 -0700
Subject: [PATCH 11/20] Add a slighly cheesy contributors panel to readme
 (#6520)

It's good so many people have contributed!
---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 0df9e7d1bac..012991701a1 100644
--- a/README.md
+++ b/README.md
@@ -99,6 +99,12 @@ released as open source in May 2014. The project was renamed from
 "xray" in January 2016. Xarray became a fiscally sponsored project of
 [NumFOCUS](https://numfocus.org) in August 2018.
 
+## Contributors
+
+Thanks to our many contributors!
+
+[![Contributors](https://contrib.rocks/image?repo=pydata/xarray)](https://github.com/pydata/xarray/graphs/contributors)
+
 ## License
 
 Copyright 2014-2019, xarray Developers

From 8df65b3f76ac5316c4d03de58812d76e2119352f Mon Sep 17 00:00:00 2001
From: Maximilian Roos <5635139+max-sixty@users.noreply.github.com>
Date: Fri, 29 Apr 2022 10:47:03 -0700
Subject: [PATCH 12/20] Remove duplicate tests (#6536)

* Remove duplicate tests

Merge this in a few days when we know nothing is missing

* Add env to cache key
---
 .github/workflows/ci-additional.yaml          | 92 +------------------
 .github/workflows/ci.yaml                     | 26 +++---
 ...py39-all-but-dask.yml => all-but-dask.yml} |  6 +-
 ...py38-bare-minimum.yml => bare-minimum.yml} |  0
 ...py38-min-all-deps.yml => min-all-deps.yml} |  0
 doc/getting-started-guide/installing.rst      |  2 +-
 6 files changed, 18 insertions(+), 108 deletions(-)
 rename ci/requirements/{py39-all-but-dask.yml => all-but-dask.yml} (90%)
 rename ci/requirements/{py38-bare-minimum.yml => bare-minimum.yml} (100%)
 rename ci/requirements/{py38-min-all-deps.yml => min-all-deps.yml} (100%)

diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml
index 0b4e0f185c7..358f85298c3 100644
--- a/.github/workflows/ci-additional.yaml
+++ b/.github/workflows/ci-additional.yaml
@@ -30,94 +30,6 @@ jobs:
         with:
           keyword: "[skip-ci]"
 
-  # This job is deprecated and can be removed soon. It's still here in case the
-  # move consolidate with `ci.yaml` missed something which the existing test
-  # picks up.
-  test:
-    name: ${{ matrix.os }} ${{ matrix.env }}
-    runs-on: ${{ matrix.os }}
-    needs: detect-ci-trigger
-    if: needs.detect-ci-trigger.outputs.triggered == 'false'
-    defaults:
-      run:
-        shell: bash -l {0}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: ["ubuntu-latest"]
-        env: [
-            # Minimum python version:
-            "py38-bare-minimum",
-            "py38-min-all-deps",
-
-            # Latest python version:
-            "py39-all-but-dask",
-            "py39-flaky",
-          ]
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0 # Fetch all history for all branches and tags.
-
-      - name: Set environment variables
-        run: |
-          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
-
-          else
-            echo "CONDA_ENV_FILE=ci/requirements/${{ matrix.env }}.yml" >> $GITHUB_ENV
-          fi
-
-      - name: Cache conda
-        uses: actions/cache@v3
-        with:
-          path: ~/conda_pkgs_dir
-          key: ${{ runner.os }}-conda-${{ matrix.env }}-${{
-            hashFiles('ci/requirements/**.yml') }}
-
-      - uses: conda-incubator/setup-miniconda@v2
-        with:
-          channels: conda-forge
-          channel-priority: strict
-          mamba-version: "*"
-          activate-environment: xarray-tests
-          auto-update-conda: false
-          python-version: 3.9
-          use-only-tar-bz2: true
-
-      - name: Install conda dependencies
-        run: |
-          mamba env update -f $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: Import xarray
-        run: |
-          python -c "import xarray"
-      - name: Run tests
-        run: |
-          python -m pytest -n 4 \
-             --cov=xarray \
-             --cov-report=xml \
-             $PYTEST_EXTRA_FLAGS
-
-      - name: Upload code coverage to Codecov
-        uses: codecov/codecov-action@v3.1.0
-        with:
-          file: ./coverage.xml
-          flags: unittests,${{ matrix.env }}
-          env_vars: RUNNER_OS
-          name: codecov-umbrella
-          fail_ci_if_error: false
   doctest:
     name: Doctests
     runs-on: "ubuntu-latest"
@@ -220,5 +132,5 @@ jobs:
       - name: minimum versions policy
         run: |
           mamba install -y pyyaml conda python-dateutil
-          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
+          python ci/min_deps_check.py ci/requirements/bare-minimum.yml
+          python ci/min_deps_check.py ci/requirements/min-all-deps.yml
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 53db5d9066d..b6979dc58cd 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -30,7 +30,7 @@ jobs:
         with:
           keyword: "[skip-ci]"
   test:
-    name: ${{ matrix.os }} py${{ matrix.python-version }}
+    name: ${{ matrix.os }} py${{ matrix.python-version }} ${{ matrix.env }}
     runs-on: ${{ matrix.os }}
     needs: detect-ci-trigger
     if: needs.detect-ci-trigger.outputs.triggered == 'false'
@@ -45,18 +45,18 @@ jobs:
         python-version: ["3.8", "3.10"]
         include:
           # Minimum python version:
-          - env: "py38-bare-minimum"
-            python-version: 3.8
+          - env: "bare-minimum"
+            python-version: "3.8"
             os: ubuntu-latest
-          - env: "py38-min-all-deps"
-            python-version: 3.8
+          - env: "min-all-deps"
+            python-version: "3.8"
             os: ubuntu-latest
           # Latest python version:
-          - env: "py39-all-but-dask"
-            python-version: 3.9
+          - env: "all-but-dask"
+            python-version: "3.10"
             os: ubuntu-latest
-          - env: "py39-flaky"
-            python-version: 3.9
+          - env: "flaky"
+            python-version: "3.10"
             os: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -69,7 +69,7 @@ jobs:
             echo "CONDA_ENV_FILE=ci/requirements/environment-windows.yml" >> $GITHUB_ENV
           elif [[ "${{ matrix.env }}" != "" ]] ;
           then
-            if [[ "${{ matrix.env }}" == "py39-flaky" ]] ;
+            if [[ "${{ matrix.env }}" == "flaky" ]] ;
             then
               echo "CONDA_ENV_FILE=ci/requirements/environment.yml" >> $GITHUB_ENV
               echo "PYTEST_EXTRA_FLAGS=--run-flaky --run-network-tests" >> $GITHUB_ENV
@@ -88,8 +88,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/conda_pkgs_dir
-          key: ${{ runner.os }}-conda-py${{ matrix.python-version }}-${{
-            hashFiles('ci/requirements/**.yml') }}
+          key: ${{ runner.os }}-conda-py${{ matrix.python-version }}-${{ hashFiles('ci/requirements/**.yml') }}-${{ matrix.env }}
 
       - uses: conda-incubator/setup-miniconda@v2
         with:
@@ -106,8 +105,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: /usr/share/miniconda/envs/xarray-tests
-          key: ${{ runner.os }}-conda-py${{ matrix.python-version }}-${{
-            hashFiles('ci/requirements/**.yml') }}
+          key: ${{ runner.os }}-conda-py${{ matrix.python-version }}-${{ hashFiles('ci/requirements/**.yml') }}-${{ matrix.env }}
 
       - name: Install conda dependencies
         run: |
diff --git a/ci/requirements/py39-all-but-dask.yml b/ci/requirements/all-but-dask.yml
similarity index 90%
rename from ci/requirements/py39-all-but-dask.yml
rename to ci/requirements/all-but-dask.yml
index 9c42d5f3b73..cb9ec8d3bc5 100644
--- a/ci/requirements/py39-all-but-dask.yml
+++ b/ci/requirements/all-but-dask.yml
@@ -3,7 +3,7 @@ channels:
   - conda-forge
   - nodefaults
 dependencies:
-  - python=3.9
+  - python=3.10
   - black
   - aiobotocore
   - boto3
@@ -17,7 +17,7 @@ dependencies:
   - h5py
   - hdf5
   - hypothesis
-  - lxml    # Optional dep of pydap
+  - lxml # Optional dep of pydap
   - matplotlib-base
   - nc-time-axis
   - netcdf4
@@ -42,4 +42,4 @@ dependencies:
   - typing_extensions
   - zarr
   - pip:
-    - numbagg
+      - numbagg
diff --git a/ci/requirements/py38-bare-minimum.yml b/ci/requirements/bare-minimum.yml
similarity index 100%
rename from ci/requirements/py38-bare-minimum.yml
rename to ci/requirements/bare-minimum.yml
diff --git a/ci/requirements/py38-min-all-deps.yml b/ci/requirements/min-all-deps.yml
similarity index 100%
rename from ci/requirements/py38-min-all-deps.yml
rename to ci/requirements/min-all-deps.yml
diff --git a/doc/getting-started-guide/installing.rst b/doc/getting-started-guide/installing.rst
index 6177ba0aaac..0668853946f 100644
--- a/doc/getting-started-guide/installing.rst
+++ b/doc/getting-started-guide/installing.rst
@@ -102,7 +102,7 @@ release is guaranteed to work.
 
 You can see the actual minimum tested versions:
 
-`<https://github.com/pydata/xarray/blob/main/ci/requirements/py38-min-all-deps.yml>`_
+`<https://github.com/pydata/xarray/blob/main/ci/requirements/min-all-deps.yml>`_
 
 .. _installation-instructions:
 

From 61e966cf9c71a63a1c0b23689b39345d6526e9e0 Mon Sep 17 00:00:00 2001
From: Maximilian Roos <5635139+max-sixty@users.noreply.github.com>
Date: Fri, 29 Apr 2022 11:00:10 -0700
Subject: [PATCH 13/20] Revert "Remove duplicate tests (#6536)" (#6540)

This reverts commit 8df65b3f76ac5316c4d03de58812d76e2119352f.
---
 .github/workflows/ci-additional.yaml          | 92 ++++++++++++++++++-
 .github/workflows/ci.yaml                     | 26 +++---
 ...bare-minimum.yml => py38-bare-minimum.yml} |  0
 ...min-all-deps.yml => py38-min-all-deps.yml} |  0
 ...all-but-dask.yml => py39-all-but-dask.yml} |  6 +-
 doc/getting-started-guide/installing.rst      |  2 +-
 6 files changed, 108 insertions(+), 18 deletions(-)
 rename ci/requirements/{bare-minimum.yml => py38-bare-minimum.yml} (100%)
 rename ci/requirements/{min-all-deps.yml => py38-min-all-deps.yml} (100%)
 rename ci/requirements/{all-but-dask.yml => py39-all-but-dask.yml} (90%)

diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml
index 358f85298c3..0b4e0f185c7 100644
--- a/.github/workflows/ci-additional.yaml
+++ b/.github/workflows/ci-additional.yaml
@@ -30,6 +30,94 @@ jobs:
         with:
           keyword: "[skip-ci]"
 
+  # This job is deprecated and can be removed soon. It's still here in case the
+  # move consolidate with `ci.yaml` missed something which the existing test
+  # picks up.
+  test:
+    name: ${{ matrix.os }} ${{ matrix.env }}
+    runs-on: ${{ matrix.os }}
+    needs: detect-ci-trigger
+    if: needs.detect-ci-trigger.outputs.triggered == 'false'
+    defaults:
+      run:
+        shell: bash -l {0}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ["ubuntu-latest"]
+        env: [
+            # Minimum python version:
+            "py38-bare-minimum",
+            "py38-min-all-deps",
+
+            # Latest python version:
+            "py39-all-but-dask",
+            "py39-flaky",
+          ]
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0 # Fetch all history for all branches and tags.
+
+      - name: Set environment variables
+        run: |
+          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
+
+          else
+            echo "CONDA_ENV_FILE=ci/requirements/${{ matrix.env }}.yml" >> $GITHUB_ENV
+          fi
+
+      - name: Cache conda
+        uses: actions/cache@v3
+        with:
+          path: ~/conda_pkgs_dir
+          key: ${{ runner.os }}-conda-${{ matrix.env }}-${{
+            hashFiles('ci/requirements/**.yml') }}
+
+      - uses: conda-incubator/setup-miniconda@v2
+        with:
+          channels: conda-forge
+          channel-priority: strict
+          mamba-version: "*"
+          activate-environment: xarray-tests
+          auto-update-conda: false
+          python-version: 3.9
+          use-only-tar-bz2: true
+
+      - name: Install conda dependencies
+        run: |
+          mamba env update -f $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: Import xarray
+        run: |
+          python -c "import xarray"
+      - name: Run tests
+        run: |
+          python -m pytest -n 4 \
+             --cov=xarray \
+             --cov-report=xml \
+             $PYTEST_EXTRA_FLAGS
+
+      - name: Upload code coverage to Codecov
+        uses: codecov/codecov-action@v3.1.0
+        with:
+          file: ./coverage.xml
+          flags: unittests,${{ matrix.env }}
+          env_vars: RUNNER_OS
+          name: codecov-umbrella
+          fail_ci_if_error: false
   doctest:
     name: Doctests
     runs-on: "ubuntu-latest"
@@ -132,5 +220,5 @@ jobs:
       - name: minimum versions policy
         run: |
           mamba install -y pyyaml conda python-dateutil
-          python ci/min_deps_check.py ci/requirements/bare-minimum.yml
-          python ci/min_deps_check.py ci/requirements/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
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index b6979dc58cd..53db5d9066d 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -30,7 +30,7 @@ jobs:
         with:
           keyword: "[skip-ci]"
   test:
-    name: ${{ matrix.os }} py${{ matrix.python-version }} ${{ matrix.env }}
+    name: ${{ matrix.os }} py${{ matrix.python-version }}
     runs-on: ${{ matrix.os }}
     needs: detect-ci-trigger
     if: needs.detect-ci-trigger.outputs.triggered == 'false'
@@ -45,18 +45,18 @@ jobs:
         python-version: ["3.8", "3.10"]
         include:
           # Minimum python version:
-          - env: "bare-minimum"
-            python-version: "3.8"
+          - env: "py38-bare-minimum"
+            python-version: 3.8
             os: ubuntu-latest
-          - env: "min-all-deps"
-            python-version: "3.8"
+          - env: "py38-min-all-deps"
+            python-version: 3.8
             os: ubuntu-latest
           # Latest python version:
-          - env: "all-but-dask"
-            python-version: "3.10"
+          - env: "py39-all-but-dask"
+            python-version: 3.9
             os: ubuntu-latest
-          - env: "flaky"
-            python-version: "3.10"
+          - env: "py39-flaky"
+            python-version: 3.9
             os: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -69,7 +69,7 @@ jobs:
             echo "CONDA_ENV_FILE=ci/requirements/environment-windows.yml" >> $GITHUB_ENV
           elif [[ "${{ matrix.env }}" != "" ]] ;
           then
-            if [[ "${{ matrix.env }}" == "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
@@ -88,7 +88,8 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/conda_pkgs_dir
-          key: ${{ runner.os }}-conda-py${{ matrix.python-version }}-${{ hashFiles('ci/requirements/**.yml') }}-${{ matrix.env }}
+          key: ${{ runner.os }}-conda-py${{ matrix.python-version }}-${{
+            hashFiles('ci/requirements/**.yml') }}
 
       - uses: conda-incubator/setup-miniconda@v2
         with:
@@ -105,7 +106,8 @@ jobs:
         uses: actions/cache@v3
         with:
           path: /usr/share/miniconda/envs/xarray-tests
-          key: ${{ runner.os }}-conda-py${{ matrix.python-version }}-${{ hashFiles('ci/requirements/**.yml') }}-${{ matrix.env }}
+          key: ${{ runner.os }}-conda-py${{ matrix.python-version }}-${{
+            hashFiles('ci/requirements/**.yml') }}
 
       - name: Install conda dependencies
         run: |
diff --git a/ci/requirements/bare-minimum.yml b/ci/requirements/py38-bare-minimum.yml
similarity index 100%
rename from ci/requirements/bare-minimum.yml
rename to ci/requirements/py38-bare-minimum.yml
diff --git a/ci/requirements/min-all-deps.yml b/ci/requirements/py38-min-all-deps.yml
similarity index 100%
rename from ci/requirements/min-all-deps.yml
rename to ci/requirements/py38-min-all-deps.yml
diff --git a/ci/requirements/all-but-dask.yml b/ci/requirements/py39-all-but-dask.yml
similarity index 90%
rename from ci/requirements/all-but-dask.yml
rename to ci/requirements/py39-all-but-dask.yml
index cb9ec8d3bc5..9c42d5f3b73 100644
--- a/ci/requirements/all-but-dask.yml
+++ b/ci/requirements/py39-all-but-dask.yml
@@ -3,7 +3,7 @@ channels:
   - conda-forge
   - nodefaults
 dependencies:
-  - python=3.10
+  - python=3.9
   - black
   - aiobotocore
   - boto3
@@ -17,7 +17,7 @@ dependencies:
   - h5py
   - hdf5
   - hypothesis
-  - lxml # Optional dep of pydap
+  - lxml    # Optional dep of pydap
   - matplotlib-base
   - nc-time-axis
   - netcdf4
@@ -42,4 +42,4 @@ dependencies:
   - typing_extensions
   - zarr
   - pip:
-      - numbagg
+    - numbagg
diff --git a/doc/getting-started-guide/installing.rst b/doc/getting-started-guide/installing.rst
index 0668853946f..6177ba0aaac 100644
--- a/doc/getting-started-guide/installing.rst
+++ b/doc/getting-started-guide/installing.rst
@@ -102,7 +102,7 @@ release is guaranteed to work.
 
 You can see the actual minimum tested versions:
 
-`<https://github.com/pydata/xarray/blob/main/ci/requirements/min-all-deps.yml>`_
+`<https://github.com/pydata/xarray/blob/main/ci/requirements/py38-min-all-deps.yml>`_
 
 .. _installation-instructions:
 

From 93b88135187b05d182929a4a29850157f0e4f8e0 Mon Sep 17 00:00:00 2001
From: Maximilian Roos <5635139+max-sixty@users.noreply.github.com>
Date: Fri, 29 Apr 2022 11:38:55 -0700
Subject: [PATCH 14/20] Revert "Attempt to improve CI caching (#6534)" (#6543)

This reverts commit 8cf9e57127e4ff8ff0efe1cb15c5fedc107a82bf.
---
 .github/workflows/ci-additional.yaml |  1 -
 .github/workflows/ci.yaml            | 12 ------------
 2 files changed, 13 deletions(-)

diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml
index 0b4e0f185c7..61b9fc99bd7 100644
--- a/.github/workflows/ci-additional.yaml
+++ b/.github/workflows/ci-additional.yaml
@@ -69,7 +69,6 @@ jobs:
           else
             echo "CONDA_ENV_FILE=ci/requirements/${{ matrix.env }}.yml" >> $GITHUB_ENV
           fi
-
       - name: Cache conda
         uses: actions/cache@v3
         with:
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 53db5d9066d..57ec914f877 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -82,15 +82,12 @@ jobs:
 
           echo "PYTHON_VERSION=${{ matrix.python-version }}" >> $GITHUB_ENV
 
-        # This and the next few are based on https://github.com/conda-incubator/setup-miniconda#caching-environments
       - name: Cache conda
-        id: cache-conda
         uses: actions/cache@v3
         with:
           path: ~/conda_pkgs_dir
           key: ${{ runner.os }}-conda-py${{ matrix.python-version }}-${{
             hashFiles('ci/requirements/**.yml') }}
-
       - uses: conda-incubator/setup-miniconda@v2
         with:
           channels: conda-forge
@@ -101,18 +98,9 @@ jobs:
           python-version: ${{ matrix.python-version }}
           use-only-tar-bz2: true
 
-      - name: Cache conda env
-        id: cache-env
-        uses: actions/cache@v3
-        with:
-          path: /usr/share/miniconda/envs/xarray-tests
-          key: ${{ runner.os }}-conda-py${{ matrix.python-version }}-${{
-            hashFiles('ci/requirements/**.yml') }}
-
       - name: Install conda dependencies
         run: |
           mamba env update -f $CONDA_ENV_FILE
-        if: steps.cache-env.outputs.cache-hit != 'true'
 
       # We only want to install this on one run, because otherwise we'll have
       # duplicate annotations.

From c9c7bcaf28e885810ca8cc1c577accd5e74e9e95 Mon Sep 17 00:00:00 2001
From: Deepak Cherian <dcherian@users.noreply.github.com>
Date: Fri, 29 Apr 2022 20:03:45 -0600
Subject: [PATCH 15/20] Direct usage questions to GH discussions (#6539)

Co-authored-by: Maximilian Roos <5635139+max-sixty@users.noreply.github.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 012991701a1..ff8fceefa99 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ page](https://docs.xarray.dev/en/latest/contributing.html#).
 ## Get in touch
 
 - Ask usage questions ("How do I?") on
-    [StackOverflow](https://stackoverflow.com/questions/tagged/python-xarray).
+    [GitHub Discussions](https://github.com/pydata/xarray/discussions).
 - Report bugs, suggest features or view the source code [on
     GitHub](https://github.com/pydata/xarray).
 - For less well defined questions or ideas, or to announce other

From aee71068e61a26cbaab997df802fca6422c3867e Mon Sep 17 00:00:00 2001
From: Maximilian Roos <5635139+max-sixty@users.noreply.github.com>
Date: Sat, 30 Apr 2022 13:56:53 -0700
Subject: [PATCH 16/20] Skip mypy tests in CI (#6552)

Almost all the way there on rolling back everything I've done recently :)
---
 .github/workflows/ci-additional.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml
index 61b9fc99bd7..e1dcb664d54 100644
--- a/.github/workflows/ci-additional.yaml
+++ b/.github/workflows/ci-additional.yaml
@@ -158,7 +158,9 @@ jobs:
     name: Mypy
     runs-on: "ubuntu-latest"
     needs: detect-ci-trigger
-    if: needs.detect-ci-trigger.outputs.triggered == 'false'
+    # temporarily skipping due to https://github.com/pydata/xarray/issues/6551
+    # if: needs.detect-ci-trigger.outputs.triggered == 'false'
+    if: false
     defaults:
       run:
         shell: bash -l {0}

From c003deac1c44702355f4c37d4c23e3171c98815a Mon Sep 17 00:00:00 2001
From: Maximilian Roos <5635139+max-sixty@users.noreply.github.com>
Date: Sat, 30 Apr 2022 15:47:47 -0700
Subject: [PATCH 17/20] Remove duplicate tests, v3 (#6550)

* Revert "Revert "Remove duplicate tests (#6536)" (#6540)"

This reverts commit 61e966cf9c71a63a1c0b23689b39345d6526e9e0.
---
 .github/workflows/ci-additional.yaml          | 91 +------------------
 .github/workflows/ci.yaml                     | 25 ++---
 ...py39-all-but-dask.yml => all-but-dask.yml} |  6 +-
 ...py38-bare-minimum.yml => bare-minimum.yml} |  0
 ...py38-min-all-deps.yml => min-all-deps.yml} |  0
 doc/getting-started-guide/installing.rst      |  2 +-
 6 files changed, 19 insertions(+), 105 deletions(-)
 rename ci/requirements/{py39-all-but-dask.yml => all-but-dask.yml} (90%)
 rename ci/requirements/{py38-bare-minimum.yml => bare-minimum.yml} (100%)
 rename ci/requirements/{py38-min-all-deps.yml => min-all-deps.yml} (100%)

diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml
index e1dcb664d54..a5ddceebf11 100644
--- a/.github/workflows/ci-additional.yaml
+++ b/.github/workflows/ci-additional.yaml
@@ -30,93 +30,6 @@ jobs:
         with:
           keyword: "[skip-ci]"
 
-  # This job is deprecated and can be removed soon. It's still here in case the
-  # move consolidate with `ci.yaml` missed something which the existing test
-  # picks up.
-  test:
-    name: ${{ matrix.os }} ${{ matrix.env }}
-    runs-on: ${{ matrix.os }}
-    needs: detect-ci-trigger
-    if: needs.detect-ci-trigger.outputs.triggered == 'false'
-    defaults:
-      run:
-        shell: bash -l {0}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: ["ubuntu-latest"]
-        env: [
-            # Minimum python version:
-            "py38-bare-minimum",
-            "py38-min-all-deps",
-
-            # Latest python version:
-            "py39-all-but-dask",
-            "py39-flaky",
-          ]
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0 # Fetch all history for all branches and tags.
-
-      - name: Set environment variables
-        run: |
-          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
-
-          else
-            echo "CONDA_ENV_FILE=ci/requirements/${{ matrix.env }}.yml" >> $GITHUB_ENV
-          fi
-      - name: Cache conda
-        uses: actions/cache@v3
-        with:
-          path: ~/conda_pkgs_dir
-          key: ${{ runner.os }}-conda-${{ matrix.env }}-${{
-            hashFiles('ci/requirements/**.yml') }}
-
-      - uses: conda-incubator/setup-miniconda@v2
-        with:
-          channels: conda-forge
-          channel-priority: strict
-          mamba-version: "*"
-          activate-environment: xarray-tests
-          auto-update-conda: false
-          python-version: 3.9
-          use-only-tar-bz2: true
-
-      - name: Install conda dependencies
-        run: |
-          mamba env update -f $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: Import xarray
-        run: |
-          python -c "import xarray"
-      - name: Run tests
-        run: |
-          python -m pytest -n 4 \
-             --cov=xarray \
-             --cov-report=xml \
-             $PYTEST_EXTRA_FLAGS
-
-      - name: Upload code coverage to Codecov
-        uses: codecov/codecov-action@v3.1.0
-        with:
-          file: ./coverage.xml
-          flags: unittests,${{ matrix.env }}
-          env_vars: RUNNER_OS
-          name: codecov-umbrella
-          fail_ci_if_error: false
   doctest:
     name: Doctests
     runs-on: "ubuntu-latest"
@@ -221,5 +134,5 @@ jobs:
       - name: minimum versions policy
         run: |
           mamba install -y pyyaml conda python-dateutil
-          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
+          python ci/min_deps_check.py ci/requirements/bare-minimum.yml
+          python ci/min_deps_check.py ci/requirements/min-all-deps.yml
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 57ec914f877..20f876b52fc 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -30,7 +30,7 @@ jobs:
         with:
           keyword: "[skip-ci]"
   test:
-    name: ${{ matrix.os }} py${{ matrix.python-version }}
+    name: ${{ matrix.os }} py${{ matrix.python-version }} ${{ matrix.env }}
     runs-on: ${{ matrix.os }}
     needs: detect-ci-trigger
     if: needs.detect-ci-trigger.outputs.triggered == 'false'
@@ -43,20 +43,21 @@ jobs:
         os: ["ubuntu-latest", "macos-latest", "windows-latest"]
         # Bookend python versions
         python-version: ["3.8", "3.10"]
+        env: [""]
         include:
           # Minimum python version:
-          - env: "py38-bare-minimum"
-            python-version: 3.8
+          - env: "bare-minimum"
+            python-version: "3.8"
             os: ubuntu-latest
-          - env: "py38-min-all-deps"
-            python-version: 3.8
+          - env: "min-all-deps"
+            python-version: "3.8"
             os: ubuntu-latest
           # Latest python version:
-          - env: "py39-all-but-dask"
-            python-version: 3.9
+          - env: "all-but-dask"
+            python-version: "3.10"
             os: ubuntu-latest
-          - env: "py39-flaky"
-            python-version: 3.9
+          - env: "flaky"
+            python-version: "3.10"
             os: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -69,7 +70,7 @@ jobs:
             echo "CONDA_ENV_FILE=ci/requirements/environment-windows.yml" >> $GITHUB_ENV
           elif [[ "${{ matrix.env }}" != "" ]] ;
           then
-            if [[ "${{ matrix.env }}" == "py39-flaky" ]] ;
+            if [[ "${{ matrix.env }}" == "flaky" ]] ;
             then
               echo "CONDA_ENV_FILE=ci/requirements/environment.yml" >> $GITHUB_ENV
               echo "PYTEST_EXTRA_FLAGS=--run-flaky --run-network-tests" >> $GITHUB_ENV
@@ -86,8 +87,8 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/conda_pkgs_dir
-          key: ${{ runner.os }}-conda-py${{ matrix.python-version }}-${{
-            hashFiles('ci/requirements/**.yml') }}
+          key: ${{ runner.os }}-conda-py${{ matrix.python-version }}-${{ hashFiles('ci/requirements/**.yml') }}-${{ matrix.env }}
+
       - uses: conda-incubator/setup-miniconda@v2
         with:
           channels: conda-forge
diff --git a/ci/requirements/py39-all-but-dask.yml b/ci/requirements/all-but-dask.yml
similarity index 90%
rename from ci/requirements/py39-all-but-dask.yml
rename to ci/requirements/all-but-dask.yml
index 9c42d5f3b73..cb9ec8d3bc5 100644
--- a/ci/requirements/py39-all-but-dask.yml
+++ b/ci/requirements/all-but-dask.yml
@@ -3,7 +3,7 @@ channels:
   - conda-forge
   - nodefaults
 dependencies:
-  - python=3.9
+  - python=3.10
   - black
   - aiobotocore
   - boto3
@@ -17,7 +17,7 @@ dependencies:
   - h5py
   - hdf5
   - hypothesis
-  - lxml    # Optional dep of pydap
+  - lxml # Optional dep of pydap
   - matplotlib-base
   - nc-time-axis
   - netcdf4
@@ -42,4 +42,4 @@ dependencies:
   - typing_extensions
   - zarr
   - pip:
-    - numbagg
+      - numbagg
diff --git a/ci/requirements/py38-bare-minimum.yml b/ci/requirements/bare-minimum.yml
similarity index 100%
rename from ci/requirements/py38-bare-minimum.yml
rename to ci/requirements/bare-minimum.yml
diff --git a/ci/requirements/py38-min-all-deps.yml b/ci/requirements/min-all-deps.yml
similarity index 100%
rename from ci/requirements/py38-min-all-deps.yml
rename to ci/requirements/min-all-deps.yml
diff --git a/doc/getting-started-guide/installing.rst b/doc/getting-started-guide/installing.rst
index 6177ba0aaac..0668853946f 100644
--- a/doc/getting-started-guide/installing.rst
+++ b/doc/getting-started-guide/installing.rst
@@ -102,7 +102,7 @@ release is guaranteed to work.
 
 You can see the actual minimum tested versions:
 
-`<https://github.com/pydata/xarray/blob/main/ci/requirements/py38-min-all-deps.yml>`_
+`<https://github.com/pydata/xarray/blob/main/ci/requirements/min-all-deps.yml>`_
 
 .. _installation-instructions:
 

From 6144c61a708b8f91a6bc65d0e70d7895a657c15f Mon Sep 17 00:00:00 2001
From: Maximilian Roos <5635139+max-sixty@users.noreply.github.com>
Date: Sun, 1 May 2022 15:14:31 -0700
Subject: [PATCH 18/20] Update issue template to include a checklist (#6522)

* Update issue template to include a checklist

* Update issue templates
---
 .github/ISSUE_TEMPLATE/bugreport.yml  | 20 ++++++---
 .github/ISSUE_TEMPLATE/config.yml     |  4 +-
 .github/ISSUE_TEMPLATE/misc.yml       |  4 +-
 .github/ISSUE_TEMPLATE/newfeature.yml |  2 +-
 doc/examples/blank_template.ipynb     | 58 +++++++++++++++++++++++++++
 doc/gallery.rst                       |  1 +
 6 files changed, 79 insertions(+), 10 deletions(-)
 create mode 100644 doc/examples/blank_template.ipynb

diff --git a/.github/ISSUE_TEMPLATE/bugreport.yml b/.github/ISSUE_TEMPLATE/bugreport.yml
index ba5bc8abaea..59e5889f5ec 100644
--- a/.github/ISSUE_TEMPLATE/bugreport.yml
+++ b/.github/ISSUE_TEMPLATE/bugreport.yml
@@ -1,4 +1,4 @@
-name: Bug Report
+name: 🐛 Bug Report
 description: File a bug report to help us improve
 labels: [bug, "needs triage"]
 body:
@@ -26,14 +26,24 @@ body:
     attributes:
       label: Minimal Complete Verifiable Example
       description: |
-        Minimal, self-contained copy-pastable example that generates the issue if possible. Please be concise with code posted. See guidelines below on how to provide a good bug report:
+        Minimal, self-contained copy-pastable example that demonstrates the issue.         This will be automatically formatted into code, so no need for markdown backticks.
+      render: Python
+
+  - type: checkboxes
+    id: mvce-checkboxes
+    attributes:
+      label: MVCE confirmation
+      description: |
+        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)
 
-        Bug reports that follow these guidelines are easier to diagnose, and so are often handled much more quickly.
-        This will be automatically formatted into code, so no need for markdown backticks.
-      render: Python
+      options:
+        - label: Minimal example — the example is as focused as reasonably possible to demonstrate the underlying issue in xarray.
+        - label: Complete example — the example is self-contained, including all data and the text of any traceback.
+        - label: Verifiable example — the example copy & pastes into an IPython prompt or [Binder notebook](https://mybinder.org/v2/gh/pydata/xarray/main?urlpath=lab/tree/doc/examples/blank_template.ipynb), returning the result.
+        - label: New issue — a search of GitHub Issues suggests this is not a duplicate.
 
   - type: textarea
     id: log-output
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 994c594685d..83e5f3b97fa 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,12 +1,12 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Usage question
+  - name: ❓ Usage question
     url: https://github.com/pydata/xarray/discussions
     about: |
       Ask questions and discuss with other community members here.
       If you have a question like "How do I concatenate a list of datasets?" then
       please include a self-contained reproducible example if possible.
-  - name: Raster analysis usage question
+  - name: 🗺️ Raster analysis usage question
     url: https://github.com/corteva/rioxarray/discussions
     about: |
       If you are using the rioxarray extension (engine='rasterio'), or have questions about
diff --git a/.github/ISSUE_TEMPLATE/misc.yml b/.github/ISSUE_TEMPLATE/misc.yml
index 94dd2d86567..a98f6d90c45 100644
--- a/.github/ISSUE_TEMPLATE/misc.yml
+++ b/.github/ISSUE_TEMPLATE/misc.yml
@@ -1,5 +1,5 @@
-name: Issue
-description: General Issue or discussion topic. For usage questions, please follow the "Usage question" link
+name: 📝 Issue
+description: General issue, that's not a bug report.
 labels: ["needs triage"]
 body:
   - type: markdown
diff --git a/.github/ISSUE_TEMPLATE/newfeature.yml b/.github/ISSUE_TEMPLATE/newfeature.yml
index 77cb15b7d37..04adf4bb867 100644
--- a/.github/ISSUE_TEMPLATE/newfeature.yml
+++ b/.github/ISSUE_TEMPLATE/newfeature.yml
@@ -1,4 +1,4 @@
-name: Feature Request
+name: 💡 Feature Request
 description: Suggest an idea for xarray
 labels: [enhancement]
 body:
diff --git a/doc/examples/blank_template.ipynb b/doc/examples/blank_template.ipynb
new file mode 100644
index 00000000000..bcb15c1158d
--- /dev/null
+++ b/doc/examples/blank_template.ipynb
@@ -0,0 +1,58 @@
+{
+ "cells": [
+  {
+   "cell_type": "markdown",
+   "id": "d8f54f6a",
+   "metadata": {},
+   "source": [
+    "# Blank template\n",
+    "\n",
+    "Use this notebook from Binder to test an issue or reproduce a bug report"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "41b90ede",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import xarray as xr\n",
+    "import numpy as np\n",
+    "import pandas as pd\n",
+    "\n",
+    "ds = xr.tutorial.load_dataset(\"air_temperature\")\n",
+    "da = ds[\"air\"]"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "effd9aeb",
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.8.10"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}
diff --git a/doc/gallery.rst b/doc/gallery.rst
index 36eb39d1a53..22cf0c1c379 100644
--- a/doc/gallery.rst
+++ b/doc/gallery.rst
@@ -93,6 +93,7 @@ Notebook Examples
     examples/ROMS_ocean_model
     examples/ERA5-GRIB-example
     examples/apply_ufunc_vectorize_1d
+    examples/blank_template
 
 
 External Examples

From 708204370ef168f35f250ca75e666246ae1420f6 Mon Sep 17 00:00:00 2001
From: Maximilian Roos <5635139+max-sixty@users.noreply.github.com>
Date: Sun, 1 May 2022 17:56:31 -0700
Subject: [PATCH 19/20] Run mypy tests (but always pass) (#6557)

So we can at least see the result
---
 .github/workflows/ci-additional.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml
index a5ddceebf11..9a10403d44b 100644
--- a/.github/workflows/ci-additional.yaml
+++ b/.github/workflows/ci-additional.yaml
@@ -105,10 +105,12 @@ jobs:
       - name: Install mypy
         run: |
           python -m pip install mypy
-          python -m mypy --install-types --non-interactive
 
+      # Temporarily overriding to be true due to https://github.com/pydata/xarray/issues/6551
+      # python -m mypy --install-types --non-interactive
       - name: Run mypy
-        run: python -m mypy
+        run: |
+          python -m mypy --install-types --non-interactive || true
 
   min-version-policy:
     name: Minimum Version Policy

From cf8f1d6fc306e3bcef27d5acaf0d7c9989642f52 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 2 May 2022 12:55:11 -0600
Subject: [PATCH 20/20] [pre-commit.ci] pre-commit autoupdate (#6562)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/pre-commit/mirrors-mypy: v0.942 → v0.950](https://github.com/pre-commit/mirrors-mypy/compare/v0.942...v0.950)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index d4ce6ebc523..1b11e285f1e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -46,7 +46,7 @@ repos:
   #     - id: velin
   #       args: ["--write", "--compact"]
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.942
+    rev: v0.950
     hooks:
       - id: mypy
         # Copied from setup.cfg