Enable mypy warn unused ignores (#7335)

headtr1ck · web-flow · commit 0e5e3fe0dfa6 · 2022-12-01T09:14:06.000-07:00
* warn unused ignores in mypy

* fix tyoe ignores in typed ops

* fix mypy issues

* fix one more mypy issue
diff --git a/pyproject.toml b/pyproject.toml
@@ -27,6 +27,7 @@ exclude_lines = ["pragma: no cover", "if TYPE_CHECKING"]
 exclude = 'xarray/util/generate_.*\.py'
 files = "xarray"
 show_error_codes = true
+warn_unused_ignores = true
 
 # Most of the numerical computing stack doesn't have type annotations yet.
 [[tool.mypy.overrides]]
diff --git a/xarray/__init__.py b/xarray/__init__.py
@@ -40,7 +40,7 @@
     from importlib.metadata import version as _version
 except ImportError:
     # if the fallback library is missing, we are doomed.
-    from importlib_metadata import version as _version  # type: ignore[no-redef]
+    from importlib_metadata import version as _version
 
 try:
     __version__ = _version("xarray")
diff --git a/xarray/backends/locks.py b/xarray/backends/locks.py
@@ -61,7 +61,7 @@ def _get_lock_maker(scheduler=None):
         try:
             from dask.distributed import Lock as DistributedLock
         except ImportError:
-            DistributedLock = None  # type: ignore
+            DistributedLock = None
         return DistributedLock
     else:
         raise KeyError(scheduler)
diff --git a/xarray/core/_typed_ops.pyi b/xarray/core/_typed_ops.pyi
diff --git a/xarray/core/alignment.py b/xarray/core/alignment.py
@@ -490,7 +490,7 @@ def _get_dim_pos_indexers(
             obj_idx = matching_indexes.get(key)
             if obj_idx is not None:
                 if self.reindex[key]:
-                    indexers = obj_idx.reindex_like(aligned_idx, **self.reindex_kwargs)  # type: ignore[call-arg]
+                    indexers = obj_idx.reindex_like(aligned_idx, **self.reindex_kwargs)
                     dim_pos_indexers.update(indexers)
 
         return dim_pos_indexers
diff --git a/xarray/core/combine.py b/xarray/core/combine.py
@@ -377,7 +377,7 @@ def _nested_combine(
 
 # Define type for arbitrarily-nested list of lists recursively
 # Currently mypy cannot handle this but other linters can (https://stackoverflow.com/a/53845083/3154101)
-DATASET_HYPERCUBE = Union[Dataset, Iterable["DATASET_HYPERCUBE"]]  # type: ignore
+DATASET_HYPERCUBE = Union[Dataset, Iterable["DATASET_HYPERCUBE"]]  # type: ignore[misc]
 
 
 def combine_nested(
diff --git a/xarray/core/computation.py b/xarray/core/computation.py
@@ -1734,7 +1734,7 @@ def dot(
             dim_counts.update(arr.dims)
         dims = tuple(d for d, c in dim_counts.items() if c > 1)
 
-    dot_dims: set[Hashable] = set(dims)  # type:ignore[arg-type]
+    dot_dims: set[Hashable] = set(dims)
 
     # dimensions to be parallelized
     broadcast_dims = common_dims - dot_dims
diff --git a/xarray/core/coordinates.py b/xarray/core/coordinates.py
@@ -54,11 +54,11 @@ def dtypes(self) -> Frozen[Hashable, np.dtype]:
 
     @property
     def indexes(self) -> Indexes[pd.Index]:
-        return self._data.indexes  # type: ignore[attr-defined]
+        return self._data.indexes
 
     @property
     def xindexes(self) -> Indexes[Index]:
-        return self._data.xindexes  # type: ignore[attr-defined]
+        return self._data.xindexes
 
     @property
     def variables(self):
@@ -116,11 +116,9 @@ def to_index(self, ordered_dims: Sequence[Hashable] | None = None) -> pd.Index:
             raise ValueError("no valid index for a 0-dimensional object")
         elif len(ordered_dims) == 1:
             (dim,) = ordered_dims
-            return self._data.get_index(dim)  # type: ignore[attr-defined]
+            return self._data.get_index(dim)
         else:
-            indexes = [
-                self._data.get_index(k) for k in ordered_dims  # type: ignore[attr-defined]
-            ]
+            indexes = [self._data.get_index(k) for k in ordered_dims]
 
             # compute the sizes of the repeat and tile for the cartesian product
             # (taken from pandas.core.reshape.util)
diff --git a/xarray/core/dataarray.py b/xarray/core/dataarray.py
@@ -428,7 +428,7 @@ def __init__(
 
         # TODO(shoyer): document this argument, once it becomes part of the
         # public interface.
-        self._indexes = indexes  # type: ignore[assignment]
+        self._indexes = indexes
 
         self._close = None
 
diff --git a/xarray/core/groupby.py b/xarray/core/groupby.py
@@ -713,7 +713,7 @@ def _flox_reduce(
         elif dim is ...:
             parsed_dim = tuple(self._original_obj.dims)
         else:
-            parsed_dim = tuple(dim)  # type:ignore[arg-type]
+            parsed_dim = tuple(dim)
 
         # Do this so we raise the same error message whether flox is present or not.
         # Better to control it here than in flox.
@@ -747,7 +747,7 @@ def _flox_reduce(
         result = xarray_reduce(
             self._original_obj.drop_vars(non_numeric),
             group,
-            dim=parsed_dim,  # type:ignore[arg-type]  # https://github.com/xarray-contrib/flox/issues/96
+            dim=parsed_dim,
             expected_groups=expected_groups,
             isbin=isbin,
             keep_attrs=keep_attrs,
diff --git a/xarray/core/indexing.py b/xarray/core/indexing.py
@@ -180,7 +180,7 @@ def map_index_queries(
             # forward dimension indexers with no index/coordinate
             results.append(IndexSelResult(labels))
         else:
-            results.append(index.sel(labels, **options))  # type: ignore[call-arg]
+            results.append(index.sel(labels, **options))
 
     merged = merge_sel_results(results)
 
@@ -1422,7 +1422,7 @@ def __init__(self, array: pd.Index, dtype: DTypeLike = None):
         if dtype is None:
             self._dtype = get_valid_numpy_dtype(array)
         else:
-            self._dtype = np.dtype(dtype)  # type: ignore[assignment]
+            self._dtype = np.dtype(dtype)
 
     @property
     def dtype(self) -> np.dtype:
diff --git a/xarray/core/variable.py b/xarray/core/variable.py
@@ -1509,7 +1509,7 @@ def pad(
         if reflect_type is not None:
             pad_option_kwargs["reflect_type"] = reflect_type
 
-        array = np.pad(  # type: ignore[call-overload]
+        array = np.pad(
             self.data.astype(dtype, copy=False),
             pad_width_by_index,
             mode=mode,
diff --git a/xarray/plot/dataarray_plot.py b/xarray/plot/dataarray_plot.py
@@ -1488,7 +1488,7 @@ def newplotfunc(
             if ax is None:
                 # TODO: Importing Axes3D is no longer necessary in matplotlib >= 3.2.
                 # Remove when minimum requirement of matplotlib is 3.2:
-                from mpl_toolkits.mplot3d import Axes3D  # type: ignore  # noqa: F401
+                from mpl_toolkits.mplot3d import Axes3D  # noqa: F401
 
                 # delete so it does not end up in locals()
                 del Axes3D
@@ -1521,7 +1521,7 @@ def newplotfunc(
             and not kwargs.get("_is_facetgrid", False)
             and ax is not None
         ):
-            import mpl_toolkits  # type: ignore
+            import mpl_toolkits
 
             if not isinstance(ax, mpl_toolkits.mplot3d.Axes3D):
                 raise ValueError(
diff --git a/xarray/tests/test_backends.py b/xarray/tests/test_backends.py
@@ -3153,7 +3153,7 @@ def test_open_badbytes(self) -> None:
         with pytest.raises(
             ValueError, match=r"not the signature of a valid netCDF4 file"
         ):
-            with open_dataset(BytesIO(b"garbage"), engine="h5netcdf"):  # type: ignore[arg-type]
+            with open_dataset(BytesIO(b"garbage"), engine="h5netcdf"):
                 pass
 
     def test_open_twice(self) -> None:
diff --git a/xarray/tests/test_coding_times.py b/xarray/tests/test_coding_times.py
@@ -614,7 +614,7 @@ def test_cf_timedelta_2d() -> None:
 
     actual = coding.times.decode_cf_timedelta(numbers, units)
     assert_array_equal(expected, actual)
-    assert expected.dtype == actual.dtype  # type: ignore
+    assert expected.dtype == actual.dtype
 
 
 @pytest.mark.parametrize(
@@ -651,7 +651,7 @@ def test_format_cftime_datetime(date_args, expected) -> None:
 def test_decode_cf(calendar) -> None:
     days = [1.0, 2.0, 3.0]
     # TODO: GH5690 — do we want to allow this type for `coords`?
-    da = DataArray(days, coords=[days], dims=["time"], name="test")  # type: ignore
+    da = DataArray(days, coords=[days], dims=["time"], name="test")
     ds = da.to_dataset()
 
     for v in ["test", "time"]:
diff --git a/xarray/tests/test_dataarray.py b/xarray/tests/test_dataarray.py
@@ -512,7 +512,7 @@ def test_equals_and_identical(self) -> None:
 
     def test_equals_failures(self) -> None:
         orig = DataArray(np.arange(5.0), {"a": 42}, dims="x")
-        assert not orig.equals(np.arange(5))  # type: ignore
+        assert not orig.equals(np.arange(5))  # type: ignore[arg-type]
         assert not orig.identical(123)  # type: ignore
         assert not orig.broadcast_equals({1: 2})  # type: ignore
 
@@ -2754,9 +2754,9 @@ def test_quantile_method(self, method) -> None:
         actual = DataArray(self.va).quantile(q, method=method)
 
         if Version(np.__version__) >= Version("1.22.0"):
-            expected = np.nanquantile(self.dv.values, np.array(q), method=method)  # type: ignore[call-arg]
+            expected = np.nanquantile(self.dv.values, np.array(q), method=method)
         else:
-            expected = np.nanquantile(self.dv.values, np.array(q), interpolation=method)  # type: ignore[call-arg]
+            expected = np.nanquantile(self.dv.values, np.array(q), interpolation=method)
 
         np.testing.assert_allclose(actual.values, expected)
 
diff --git a/xarray/tests/test_dataset.py b/xarray/tests/test_dataset.py
@@ -6230,7 +6230,7 @@ def test_query(self, backend, engine, parser) -> None:
         with pytest.raises(ValueError):
             ds.query("a > 5")  # type: ignore # must be dict or kwargs
         with pytest.raises(ValueError):
-            ds.query(x=(a > 5))  # type: ignore # must be query string
+            ds.query(x=(a > 5))
         with pytest.raises(IndexError):
             ds.query(y="a > 5")  # wrong length dimension
         with pytest.raises(IndexError):
diff --git a/xarray/tests/test_distributed.py b/xarray/tests/test_distributed.py
@@ -189,7 +189,7 @@ def test_dask_distributed_zarr_integration_test(
         write_kwargs: dict[str, Any] = {"consolidated": True}
         read_kwargs: dict[str, Any] = {"backend_kwargs": {"consolidated": True}}
     else:
-        write_kwargs = read_kwargs = {}  # type: ignore
+        write_kwargs = read_kwargs = {}
     chunks = {"dim1": 4, "dim2": 3, "dim3": 5}
     with cluster() as (s, [a, b]):
         with Client(s["address"], loop=loop):
diff --git a/xarray/tests/test_extensions.py b/xarray/tests/test_extensions.py
@@ -37,15 +37,14 @@ def foo(self):
 
         da = xr.DataArray(0)
         assert da.demo.foo == "bar"
-
         # accessor is cached
         assert ds.demo is ds.demo
 
         # check descriptor
         assert ds.demo.__doc__ == "Demo accessor."
         # TODO: typing doesn't seem to work with accessors
         assert xr.Dataset.demo.__doc__ == "Demo accessor."  # type: ignore
-        assert isinstance(ds.demo, DemoAccessor)  # type: ignore
+        assert isinstance(ds.demo, DemoAccessor)
         assert xr.Dataset.demo is DemoAccessor  # type: ignore
 
         # ensure we can remove it
diff --git a/xarray/tests/test_plot.py b/xarray/tests/test_plot.py
@@ -43,7 +43,7 @@
 try:
     import matplotlib as mpl
     import matplotlib.pyplot as plt
-    import mpl_toolkits  # type: ignore
+    import mpl_toolkits
 except ImportError:
     pass
 
diff --git a/xarray/tests/test_variable.py b/xarray/tests/test_variable.py
@@ -1769,9 +1769,9 @@ def test_quantile_method(self, method, use_dask) -> None:
         actual = v.quantile(q, dim="y", method=method)
 
         if Version(np.__version__) >= Version("1.22"):
-            expected = np.nanquantile(self.d, q, axis=1, method=method)  # type: ignore[call-arg]
+            expected = np.nanquantile(self.d, q, axis=1, method=method)
         else:
-            expected = np.nanquantile(self.d, q, axis=1, interpolation=method)  # type: ignore[call-arg]
+            expected = np.nanquantile(self.d, q, axis=1, interpolation=method)
 
         if use_dask:
             assert isinstance(actual.data, dask_array_type)
diff --git a/xarray/util/generate_ops.py b/xarray/util/generate_ops.py
@@ -110,7 +110,7 @@ def {method}(self: T_Dataset, other: DsCompatible) -> T_Dataset: ...{override}""
     @overload{override}
     def {method}(self, other: T_Dataset) -> T_Dataset: ...
     @overload
-    def {method}(self, other: "DatasetGroupBy") -> "Dataset": ...  # type: ignore[misc]
+    def {method}(self, other: "DatasetGroupBy") -> "Dataset": ...
     @overload
     def {method}(self: T_DataArray, other: DaCompatible) -> T_DataArray: ..."""
 stub_var = """\
@@ -124,7 +124,7 @@ def {method}(self: T_Variable, other: VarCompatible) -> T_Variable: ..."""
     @overload{override}
     def {method}(self, other: T_Dataset) -> T_Dataset: ...
     @overload
-    def {method}(self, other: "DataArray") -> "Dataset": ...  # type: ignore[misc]
+    def {method}(self, other: "DataArray") -> "Dataset": ...
     @overload
     def {method}(self, other: GroupByIncompatible) -> NoReturn: ..."""
 stub_dagb = """\
