(chore): remove non-reindex fixes

Author: ilan-gold

xarray/core/extension_array.py

@@ -62,7 +62,7 @@ def __extension_duck_array__astype(
     casting: str = "unsafe",
     subok: bool = True,
     copy: bool = True,
-    device: str = None,
+    device: str | None = None,
 ) -> T_ExtensionArray:
     if (
         not (
@@ -209,55 +209,6 @@ def __init__(self, array: T_ExtensionArray):
             raise TypeError(f"{array} is not an pandas ExtensionArray.")
         self.array = array
 
-        self._add_ops_dunders()
-
-    def _add_ops_dunders(self):
-        """Delegate all operators to pd.Series"""
-
-        def create_dunder(name: str) -> Callable:
-            def binary_dunder(self, other):
-                self, other = replace_duck_with_series((self, other))
-                res = getattr(pd.Series, name)(self, other)
-                if isinstance(res, pd.Series):
-                    res = PandasExtensionArray(res.array)
-                return res
-
-            return binary_dunder
-
-        # see pandas.core.arraylike.OpsMixin
-        binary_operators = [
-            "__eq__",
-            "__ne__",
-            "__lt__",
-            "__le__",
-            "__gt__",
-            "__ge__",
-            "__and__",
-            "__rand__",
-            "__or__",
-            "__ror__",
-            "__xor__",
-            "__rxor__",
-            "__add__",
-            "__radd__",
-            "__sub__",
-            "__rsub__",
-            "__mul__",
-            "__rmul__",
-            "__truediv__",
-            "__rtruediv__",
-            "__floordiv__",
-            "__rfloordiv__",
-            "__mod__",
-            "__rmod__",
-            "__divmod__",
-            "__rdivmod__",
-            "__pow__",
-            "__rpow__",
-        ]
-        for method_name in binary_operators:
-            setattr(self.__class__, method_name, create_dunder(method_name))
-
     def __array_function__(self, func, types, args, kwargs):
         args = replace_duck_with_extension_array(args)
         if func not in HANDLED_EXTENSION_ARRAY_FUNCTIONS:
@@ -268,17 +219,7 @@ def __array_function__(self, func, types, args, kwargs):
         return res
 
     def __array_ufunc__(self, ufunc, method, *inputs, **kwargs):
-        if first_ea := next(
-            (x for x in inputs if isinstance(x, PandasExtensionArray)), None
-        ):
-            inputs = replace_duck_with_series(inputs)
-            res = first_ea.__array_ufunc__(ufunc, method, *inputs, **kwargs)
-            if isinstance(res, pd.Series):
-                arr = res.array
-                return type(self)[type(arr)](arr)
-            return res
-
-        return getattr(ufunc, method)(*inputs, **kwargs)
+        return ufunc(*inputs, **kwargs)
 
     def __repr__(self):
         return f"PandasExtensionArray(array={self.array!r})"
@@ -299,3 +240,11 @@ def __setitem__(self, key, val):
 
     def __len__(self):
         return len(self.array)
+
+    def __eq__(self, other):
+        if isinstance(other, PandasExtensionArray):
+            return self.array == other.array
+        return self.array == other
+
+    def __ne__(self, other):
+        return ~(self == other)

xarray/tests/test_dataarray.py

@@ -34,7 +34,6 @@
 from xarray.core import dtypes
 from xarray.core.common import full_like
 from xarray.core.coordinates import Coordinates
-from xarray.core.extension_array import PandasExtensionArray
 from xarray.core.indexes import Index, PandasIndex, filter_indexes_from_coords
 from xarray.core.types import QueryEngineOptions, QueryParserOptions
 from xarray.core.utils import is_scalar
@@ -1793,12 +1792,12 @@ def test_reindex_empty_array_dtype(self) -> None:
         x = xr.DataArray([], dims=("x",), coords={"x": []}).astype("float32")
         y = x.reindex(x=[1.0, 2.0])
 
-        assert (
-            x.dtype == y.dtype
-        ), "Dtype of reindexed DataArray should match dtype of the original DataArray"
-        assert (
-            y.dtype == np.float32
-        ), "Dtype of reindexed DataArray should remain float32"
+        assert x.dtype == y.dtype, (
+            "Dtype of reindexed DataArray should match dtype of the original DataArray"
+        )
+        assert y.dtype == np.float32, (
+            "Dtype of reindexed DataArray should remain float32"
+        )
 
     def test_reindex_extension_array(self) -> None:
         index1 = np.array([1, 2, 3])
@@ -7289,24 +7288,6 @@ def test_from_series_regression() -> None:
     srs = pd.Series(index=[1, 2, 3], data=pd.array([1, 1, pd.NA]))
     arr = srs.to_xarray()
 
-    # binary operator
-    res = arr * 5
-    assert_array_equal(res, np.array([5, 5, np.nan]))
-    assert res.dtype == pd.Int64Dtype()
-    assert isinstance(res, xr.DataArray)
-
-    # NEP-13 ufunc
-    res = np.add(3, arr)
-    assert_array_equal(np.add(2, arr), np.array([3, 3, np.nan]))
-    assert res.dtype == pd.Int64Dtype()
-    assert isinstance(res, xr.DataArray)
-
-    # NEP-18 array_function
-    res = np.astype(arr.data, pd.Int32Dtype())
-    assert_array_equal(res, arr)
-    assert res.dtype == pd.Int32Dtype()
-    assert isinstance(res, PandasExtensionArray)
-
     # xarray ufunc
     res = arr.fillna(0)
     assert_array_equal(res, np.array([1, 1, 0]))

xarray/tests/test_duck_array_ops.py

@@ -1143,21 +1143,3 @@ def test_extension_array_result_type_mixed(int1, categorical1):
     assert np.dtype("object") == np.result_type(
         PandasExtensionArray(int1), dt.datetime.now()
     )
-
-
-def test_extension_array_astype(int1):
-    res = np.astype(PandasExtensionArray(int1), float)
-    assert res.dtype == np.dtype("float64")
-    assert_array_equal(res, np.array([np.nan, 2, 3, np.nan, np.nan], dtype="float32"))
-
-    res = np.astype(PandasExtensionArray(int1), pd.Float64Dtype())
-    assert res.dtype == pd.Float64Dtype()
-    assert_array_equal(
-        res, pd.array([pd.NA, np.float64(2), np.float64(3), pd.NA, pd.NA])
-    )
-
-    res = np.astype(
-        PandasExtensionArray(pd.array([1, 2], dtype="int8")), pd.Int16Dtype()
-    )
-    assert res.dtype == pd.Int16Dtype()
-    assert_array_equal(res, pd.array([1, 2], dtype=pd.Int16Dtype()))