fix types

Author: dcherian

xarray/coding/variables.py

@@ -21,6 +21,7 @@
 )
 from xarray.coding.times import CFDatetimeCoder, CFTimedeltaCoder
 from xarray.core import dtypes, duck_array_ops, indexing
+from xarray.core.types import Self
 from xarray.core.variable import Variable
 
 if TYPE_CHECKING:
@@ -63,7 +64,7 @@ def _oindex_get(self, key):
     def _vindex_get(self, key):
         return type(self)(self.array.vindex[key])
 
-    def __getitem__(self, key) -> np.ndarray:
+    def __getitem__(self, key) -> Self:
         return type(self)(self.array[key])
 
     def get_duck_array(self):
@@ -104,7 +105,7 @@ def _oindex_get(self, key):
     def _vindex_get(self, key):
         return type(self)(self.array.vindex[key])
 
-    def __getitem__(self, key) -> np.ndarray:
+    def __getitem__(self, key) -> Self:
         return type(self)(self.array[key])
 
     def get_duck_array(self):

xarray/core/indexes.py

@@ -717,7 +717,7 @@ def from_variables(
 
         # preserve wrapped pd.Index (if any)
         # accessing `.data` can load data from disk, so we only access if needed
-        data = var._data if isinstance(var._data, PandasIndexingAdapter) else var.data
+        data = var._data if isinstance(var._data, PandasIndexingAdapter) else var.data  # type: ignore[redundant-expr]
         # multi-index level variable: get level index
         if isinstance(var._data, PandasMultiIndexingAdapter):
             level = var._data.level

xarray/tests/test_dtypes.py

@@ -15,7 +15,7 @@ class DummyArrayAPINamespace:
         int32 = None  # type: ignore[unused-ignore,var-annotated]
         float64 = None  # type: ignore[unused-ignore,var-annotated]
 
-    array_api_strict = DummyArrayAPINamespace
+    array_api_strict = DummyArrayAPINamespace  # type: ignore[assignment]
 
 
 @pytest.mark.parametrize(