Merge branch 'main' of github.com:pandas-dev/pandas-stubs into feature/cmp0xff/truediv

cmp0xff · cmp0xff · commit a30ffb2d217b · 2025-10-20T22:04:00.000+02:00
diff --git a/pandas-stubs/core/arrays/base.pyi b/pandas-stubs/core/arrays/base.pyi
@@ -14,6 +14,9 @@ from typing_extensions import Self
 from pandas._typing import (
     AnyArrayLikeInt,
     ArrayLike,
+    AstypeArg,
+    Dtype,
+    ListLike,
     Scalar,
     ScalarIndexer,
     SequenceIndexer,
@@ -50,16 +53,36 @@ class ExtensionArray:
     def ndim(self) -> int: ...
     @property
     def nbytes(self) -> int: ...
-    def astype(self, dtype, copy: bool = True): ...
+    @overload
+    def astype(self, dtype: np.dtype, copy: bool = True) -> np_1darray: ...
+    @overload
+    def astype(self, dtype: ExtensionDtype, copy: bool = True) -> ExtensionArray: ...
+    @overload
+    def astype(self, dtype: AstypeArg, copy: bool = True) -> ArrayLike: ...
     def isna(self) -> ArrayLike: ...
     def argsort(
         self, *, ascending: bool = ..., kind: str = ..., **kwargs: Any
     ) -> np_1darray: ...
-    def fillna(self, value=..., method=None, limit=None): ...
+    def fillna(
+        self, value: object | ArrayLike, limit: int | None = None, copy: bool = True
+    ) -> Self: ...
     def dropna(self) -> Self: ...
     def shift(self, periods: int = 1, fill_value: object = ...) -> Self: ...
     def unique(self) -> Self: ...
-    def searchsorted(self, value, side: str = ..., sorter=...): ...
+    @overload
+    def searchsorted(
+        self,
+        value: ListLike,
+        side: Literal["left", "right"] = ...,
+        sorter: ListLike | None = ...,
+    ) -> np_1darray[np.intp]: ...
+    @overload
+    def searchsorted(
+        self,
+        value: Scalar,
+        side: Literal["left", "right"] = ...,
+        sorter: ListLike | None = ...,
+    ) -> np.intp: ...
     def factorize(self, use_na_sentinel: bool = True) -> tuple[np_1darray, Self]: ...
     def repeat(
         self, repeats: int | AnyArrayLikeInt | Sequence[int], axis: None = None
@@ -72,11 +95,14 @@ class ExtensionArray:
         fill_value: Any = None,
     ) -> Self: ...
     def copy(self) -> Self: ...
-    def view(self, dtype=...) -> Self | np_1darray: ...
+    @overload
+    def view(self, dtype: None = None) -> Self: ...
+    @overload
+    def view(self, dtype: Dtype) -> ArrayLike: ...
     def ravel(self, order: Literal["C", "F", "A", "K"] | None = "C") -> Self: ...
-    def tolist(self) -> list: ...
+    def tolist(self) -> list[Any]: ...
     def _reduce(
-        self, name: str, *, skipna: bool = ..., keepdims: bool = ..., **kwargs: Any
+        self, name: str, *, skipna: bool = True, keepdims: bool = False, **kwargs: Any
     ) -> object: ...
     def _accumulate(
         self,
diff --git a/pandas-stubs/core/arrays/boolean.pyi b/pandas-stubs/core/arrays/boolean.pyi
@@ -21,6 +21,5 @@ class BooleanArray(BaseMaskedArray):
     @property
     def dtype(self): ...
     def __setitem__(self, key, value) -> None: ...
-    def astype(self, dtype, copy: bool = True): ...
     def any(self, *, skipna: bool = ..., **kwargs: Any): ...
     def all(self, *, skipna: bool = ..., **kwargs: Any): ...
diff --git a/pandas-stubs/core/arrays/categorical.pyi b/pandas-stubs/core/arrays/categorical.pyi
@@ -16,8 +16,6 @@ from pandas.core.indexes.base import Index
 from typing_extensions import Self
 
 from pandas._typing import (
-    ArrayLike,
-    Dtype,
     ListLike,
     NpDtype,
     Ordered,
@@ -49,7 +47,6 @@ class Categorical(ExtensionArray):
     def ordered(self) -> Ordered: ...
     @property
     def dtype(self) -> CategoricalDtype: ...
-    def astype(self, dtype: Dtype, copy: bool = True) -> ArrayLike: ...
     def size(self) -> int: ...
     def tolist(self) -> list[Scalar]: ...
     to_list = ...
@@ -110,7 +107,6 @@ class Categorical(ExtensionArray):
         self, *, inplace: bool = ..., ascending: bool = ..., na_position: str = ...
     ): ...
     def view(self, dtype=...): ...
-    def fillna(self, value=..., method=None, limit=None): ...
     def take(
         self, indexer: TakeIndexer, *, allow_fill: bool = ..., fill_value=...
     ) -> Categorical: ...
diff --git a/pandas-stubs/core/arrays/datetimelike.pyi b/pandas-stubs/core/arrays/datetimelike.pyi
@@ -83,7 +83,6 @@ class DatetimeLikeArrayMixin(ExtensionOpsMixin, ExtensionArray):
     def __setitem__(  # type: ignore[override] # pyright: ignore[reportIncompatibleMethodOverride]
         self, key: int | Sequence[int] | Sequence[bool] | slice, value
     ) -> None: ...
-    def astype(self, dtype, copy: bool = True): ...
     def view(self, dtype=...): ...
     def unique(self): ...
     def copy(self): ...
@@ -92,7 +91,6 @@ class DatetimeLikeArrayMixin(ExtensionOpsMixin, ExtensionArray):
     def value_counts(self, dropna: bool = True): ...
     def map(self, mapper): ...
     def isna(self): ...
-    def fillna(self, value=..., method=None, limit=None): ...
     @property
     def freq(self): ...
     @freq.setter
diff --git a/pandas-stubs/core/arrays/datetimes.pyi b/pandas-stubs/core/arrays/datetimes.pyi
@@ -30,7 +30,6 @@ class DatetimeArray(DatetimeLikeArrayMixin, TimelikeOps, DatelikeOps):
     @property
     def is_normalized(self): ...
     def __iter__(self): ...
-    def astype(self, dtype, copy: bool = True): ...
     def tz_convert(self, tz: TimeZones): ...
     def tz_localize(
         self,
diff --git a/pandas-stubs/core/arrays/integer.pyi b/pandas-stubs/core/arrays/integer.pyi
@@ -18,7 +18,6 @@ class IntegerArray(BaseMaskedArray):
     def dtype(self) -> _IntegerDtype: ...
     def __init__(self, values, mask, copy: bool = ...) -> None: ...
     def __setitem__(self, key, value) -> None: ...
-    def astype(self, dtype, copy: bool = True): ...
 
 class Int8Dtype(_IntegerDtype): ...
 class Int16Dtype(_IntegerDtype): ...
diff --git a/pandas-stubs/core/arrays/interval.pyi b/pandas-stubs/core/arrays/interval.pyi
@@ -68,10 +68,8 @@ class IntervalArray(IntervalMixin, ExtensionArray):
     def __setitem__(self, key, value) -> None: ...
     def __eq__(self, other): ...
     def __ne__(self, other): ...
-    def fillna(self, value=..., method=None, limit=None): ...
     @property
     def dtype(self): ...
-    def astype(self, dtype, copy: bool = True): ...
     def copy(self): ...
     def isna(self): ...
     @property
diff --git a/pandas-stubs/core/arrays/period.pyi b/pandas-stubs/core/arrays/period.pyi
@@ -47,4 +47,3 @@ class PeriodArray(DatetimeLikeArrayMixin, DatelikeOps):
         self, freq: PeriodFrequency | None = None, how: str = ...
     ) -> Timestamp: ...
     def asfreq(self, freq: str | None = ..., how: str = "E") -> Period: ...
-    def astype(self, dtype, copy: bool = True): ...
diff --git a/pandas-stubs/core/arrays/sparse/array.pyi b/pandas-stubs/core/arrays/sparse/array.pyi
@@ -57,7 +57,6 @@ class SparseArray(ExtensionArray, ExtensionOpsMixin):
     @property
     def npoints(self) -> int: ...
     def isna(self): ...
-    def fillna(self, value=..., method=..., limit=...): ...
     def shift(self, periods: int = 1, fill_value=...): ...
     def unique(self): ...
     def value_counts(self, dropna: bool = True): ...
@@ -69,7 +68,6 @@ class SparseArray(ExtensionArray, ExtensionOpsMixin):
         key: SequenceIndexer | tuple[int | ellipsis, ...],
     ) -> Self: ...
     def copy(self): ...
-    def astype(self, dtype=..., copy: bool = True): ...
     def map(self, mapper): ...
     def to_dense(self): ...
     def nonzero(self): ...
diff --git a/pandas-stubs/core/arrays/string_.pyi b/pandas-stubs/core/arrays/string_.pyi
@@ -15,6 +15,4 @@ class StringArray(PandasArray):
     def __init__(self, values, copy: bool = ...) -> None: ...
     def __arrow_array__(self, type=...): ...
     def __setitem__(self, key, value) -> None: ...
-    def fillna(self, value=..., method=None, limit=None): ...
-    def astype(self, dtype, copy: bool = True): ...
     def value_counts(self, dropna: bool = True): ...
diff --git a/pandas-stubs/core/arrays/timedeltas.pyi b/pandas-stubs/core/arrays/timedeltas.pyi
@@ -11,7 +11,6 @@ class TimedeltaArray(DatetimeLikeArrayMixin, TimelikeOps):
     @property
     def dtype(self): ...
     def __init__(self, values, dtype=..., freq=..., copy: bool = ...) -> None: ...
-    def astype(self, dtype, copy: bool = True): ...
     def sum(
         self,
         *,
diff --git a/tests/arrays/test_extension_array.py b/tests/arrays/test_extension_array.py
@@ -1,11 +1,20 @@
 # Test common ExtensionArray methods
 import numpy as np
 import pandas as pd
-from pandas.core.arrays.integer import IntegerArray
+from pandas.core.arrays import ExtensionArray
+from pandas.core.arrays.integer import (
+    Int32Dtype,
+    IntegerArray,
+)
 from pandas.core.construction import array
 from typing_extensions import assert_type
 
-from tests import check
+from pandas._typing import ArrayLike
+
+from tests import (
+    check,
+    np_1darray,
+)
 
 
 def test_ea_common() -> None:
@@ -30,3 +39,17 @@ def test_ea_common() -> None:
         IntegerArray,
     )
     check(assert_type(arr.ravel(), IntegerArray), IntegerArray)
+
+    check(assert_type(arr.astype(np.dtype("int64")), np_1darray), np_1darray)
+    check(assert_type(arr.astype(Int32Dtype()), ExtensionArray), ExtensionArray)
+    check(assert_type(arr.astype("Int64"), ArrayLike), ExtensionArray)
+
+    check(assert_type(arr.fillna(3, limit=1, copy=False), IntegerArray), IntegerArray)
+    check(assert_type(arr.fillna(arr), IntegerArray), IntegerArray)
+
+    check(assert_type(arr.view(), IntegerArray), IntegerArray)
+
+    check(assert_type(arr.searchsorted(1), np.intp), np.intp)
+    check(assert_type(arr.searchsorted([1]), "np_1darray[np.intp]"), np_1darray)
+    check(assert_type(arr.searchsorted(1, side="left"), np.intp), np.intp)
+    check(assert_type(arr.searchsorted(1, sorter=[1, 0, 2]), np.intp), np.intp)
diff --git a/tests/extension/decimal/array.py b/tests/extension/decimal/array.py
@@ -8,6 +8,7 @@
 from typing import (
     Any,
     cast,
+    overload,
 )
 
 import numpy as np
@@ -27,7 +28,11 @@
 )
 from pandas.core.indexers import check_array_indexer
 
-from pandas._typing import TakeIndexer
+from pandas._typing import (
+    ArrayLike,
+    AstypeArg,
+    TakeIndexer,
+)
 
 from pandas.core.dtypes.base import ExtensionDtype
 from pandas.core.dtypes.common import (
@@ -36,6 +41,8 @@
     pandas_dtype,
 )
 
+from tests import np_1darray
+
 
 @register_extension_dtype
 class DecimalDtype(ExtensionDtype):
@@ -184,6 +191,13 @@ def take(
     def copy(self) -> DecimalArray:
         return type(self)(self._data.copy(), dtype=self.dtype)
 
+    @overload
+    def astype(self, dtype: np.dtype, copy: bool = True) -> np_1darray: ...
+    @overload
+    def astype(self, dtype: ExtensionDtype, copy: bool = True) -> ExtensionArray: ...
+    @overload
+    def astype(self, dtype: AstypeArg, copy: bool = True) -> ArrayLike: ...
+
     def astype(self, dtype, copy=True):
         if is_dtype_equal(dtype, self._dtype):
             if not copy:
