Fix mypy

Author: dcherian

xarray/tests/arrays.py

@@ -173,7 +173,7 @@ def __array__(
     ) -> np.ndarray:
         raise UnexpectedDataAccess("Tried accessing data")
 
-    def __getitem__(self, key) -> "ConcatenatableArray":
+    def __getitem__(self, key) -> Self:
         """Some cases of concat require supporting expanding dims by dimensions of size 1"""
         # see https://data-apis.org/array-api/2022.12/API_specification/indexing.html#multi-axis-indexing
         arr = self._array
@@ -186,7 +186,7 @@ def __getitem__(self, key) -> "ConcatenatableArray":
                 raise UnexpectedDataAccess("Tried accessing data.")
         return ConcatenatableArray(arr)
 
-    def __eq__(self, other: "ConcatenatableArray") -> "ConcatenatableArray":
+    def __eq__(self, other: Self) -> Self:  # type: ignore[override]
         return ConcatenatableArray(self._array == other._array)
 
     def __array_function__(self, func, types, args, kwargs) -> Any:
@@ -204,15 +204,15 @@ def __array_ufunc__(self, ufunc, method, *inputs, **kwargs) -> Any:
         """We have to define this in order to convince xarray that this class is a duckarray, even though we will never support ufuncs."""
         return NotImplemented
 
-    def astype(self, dtype: np.dtype, /, *, copy: bool = True) -> "ConcatenatableArray":
+    def astype(self, dtype: np.dtype, /, *, copy: bool = True) -> Self:
         """Needed because xarray will call this even when it's a no-op"""
         if dtype != self.dtype:
             raise NotImplementedError()
         else:
             return self
 
-    def __and__(self, other: Self) -> "ConcatenatableArray":
+    def __and__(self, other: Self) -> Self:
         return type(self)(self._array & other._array)
 
-    def __or__(self, other: Self) -> "ConcatenatableArray":
+    def __or__(self, other: Self) -> Self:
         return type(self)(self._array | other._array)

xarray/tests/test_concat.py

@@ -279,7 +279,7 @@ def test_concat_multiple_datasets_missing_vars(include_day: bool) -> None:
     datasets = create_concat_datasets(
         len(vars_to_drop), seed=123, include_day=include_day
     )
-    expected = concat(datasets, dim="day", **kwargs)
+    expected = concat(datasets, dim="day", **kwargs)  # type: ignore[call-overload]
 
     for i, name in enumerate(vars_to_drop):
         if include_day:
@@ -292,8 +292,7 @@ def test_concat_multiple_datasets_missing_vars(include_day: bool) -> None:
         ds.drop_vars(varname)
         for ds, varname in zip(datasets, vars_to_drop, strict=True)
     ]
-
-    actual = concat(datasets, dim="day", **kwargs)
+    actual = concat(datasets, dim="day", **kwargs)  # type: ignore[call-overload]
 
     assert list(actual.data_vars.keys()) == [
         "pressure",