Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions pandas-stubs/api/extensions/__init__.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ from pandas.core.accessor import (
register_series_accessor as register_series_accessor,
)
from pandas.core.algorithms import take as take
from pandas.core.arrays import (
ExtensionArray as ExtensionArray,
ExtensionScalarOpsMixin as ExtensionScalarOpsMixin,
)
from pandas.core.arrays import ExtensionArray as ExtensionArray

from pandas._libs.lib import no_default as no_default

Expand Down
6 changes: 1 addition & 5 deletions pandas-stubs/core/arrays/__init__.pyi
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
from pandas.core.arrays.base import (
ExtensionArray as ExtensionArray,
ExtensionOpsMixin as ExtensionOpsMixin,
ExtensionScalarOpsMixin as ExtensionScalarOpsMixin,
)
from pandas.core.arrays.base import ExtensionArray as ExtensionArray
from pandas.core.arrays.boolean import BooleanArray as BooleanArray
from pandas.core.arrays.categorical import Categorical as Categorical
from pandas.core.arrays.datetimes import DatetimeArray as DatetimeArray
Expand Down
10 changes: 0 additions & 10 deletions pandas-stubs/core/arrays/base.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,3 @@ class ExtensionArray:
skipna: bool = True,
**kwargs: Any,
) -> Self: ...

class ExtensionOpsMixin:
@classmethod
def _add_arithmetic_ops(cls) -> None: ...
@classmethod
def _add_comparison_ops(cls) -> None: ...
@classmethod
def _add_logical_ops(cls) -> None: ...

class ExtensionScalarOpsMixin(ExtensionOpsMixin): ...
7 changes: 2 additions & 5 deletions pandas-stubs/core/arrays/datetimelike.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@ from typing import (
overload,
)

from pandas.core.arrays.base import (
ExtensionArray,
ExtensionOpsMixin,
)
from pandas.core.arrays.base import ExtensionArray
from typing_extensions import Self

from pandas._libs import (
Expand Down Expand Up @@ -55,7 +52,7 @@ class TimelikeOps:
nonexistent: TimeNonexistent = "raise",
): ...

class DatetimeLikeArrayMixin(ExtensionOpsMixin, ExtensionArray):
class DatetimeLikeArrayMixin(ExtensionArray):
@property
def ndim(self) -> int: ...
@property
Expand Down
7 changes: 2 additions & 5 deletions pandas-stubs/core/arrays/masked.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@ from typing import (
overload,
)

from pandas.core.arrays import (
ExtensionArray as ExtensionArray,
ExtensionOpsMixin,
)
from pandas.core.arrays import ExtensionArray as ExtensionArray
from typing_extensions import Self

from pandas._typing import (
Expand All @@ -18,7 +15,7 @@ from pandas._typing import (
npt,
)

class BaseMaskedArray(ExtensionArray, ExtensionOpsMixin):
class BaseMaskedArray(ExtensionArray):
@overload
def __getitem__(self, item: ScalarIndexer) -> Any: ...
@overload
Expand Down
7 changes: 2 additions & 5 deletions pandas-stubs/core/arrays/numpy_.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@ from typing import Any

import numpy as np
from numpy.lib.mixins import NDArrayOperatorsMixin
from pandas.core.arrays.base import (
ExtensionArray,
ExtensionOpsMixin,
)
from pandas.core.arrays.base import ExtensionArray

from pandas.core.dtypes.dtypes import ExtensionDtype

Expand All @@ -21,4 +18,4 @@ class PandasDtype(ExtensionDtype):
@property
def itemsize(self) -> int: ...

class PandasArray(ExtensionArray, ExtensionOpsMixin, NDArrayOperatorsMixin): ...
class PandasArray(ExtensionArray, NDArrayOperatorsMixin): ...
7 changes: 2 additions & 5 deletions pandas-stubs/core/arrays/sparse/array.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@ from typing import (
overload,
)

from pandas.core.arrays import (
ExtensionArray,
ExtensionOpsMixin,
)
from pandas.core.arrays import ExtensionArray
from typing_extensions import Self

from pandas._typing import (
Expand All @@ -22,7 +19,7 @@ from pandas._typing import (
class ellipsis(Enum):
Ellipsis = "..."

class SparseArray(ExtensionArray, ExtensionOpsMixin):
class SparseArray(ExtensionArray):
def __init__(
self,
data,
Expand Down
14 changes: 9 additions & 5 deletions tests/extension/decimal/array.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,7 @@
)
from pandas.core import arraylike
from pandas.core.arraylike import OpsMixin
from pandas.core.arrays import (
ExtensionArray,
ExtensionScalarOpsMixin,
)
from pandas.core.arrays import ExtensionArray
from pandas.core.indexers import check_array_indexer
from pandas.core.series import Series
from typing_extensions import Self
Expand Down Expand Up @@ -91,7 +88,7 @@ def _is_numeric(self) -> bool:
return True


class DecimalArray(OpsMixin, ExtensionScalarOpsMixin, ExtensionArray):
class DecimalArray(OpsMixin, ExtensionArray):
__array_priority__ = 1000

def __init__(
Expand Down Expand Up @@ -355,5 +352,12 @@ def value_counts(self, dropna: bool = True) -> Series:

return value_counts(self.to_numpy(), dropna=dropna)

@classmethod
def _add_arithmetic_ops(cls) -> None: ...
@classmethod
def _add_comparison_ops(cls) -> None: ...
@classmethod
def _add_logical_ops(cls) -> None: ...


DecimalArray._add_arithmetic_ops()