cut, pivot_table

Author: cmp0xff

pandas-stubs/__init__.pyi

@@ -70,6 +70,7 @@ from pandas.core.computation.api import eval as eval
 from pandas.core.reshape.api import (
     concat as concat,
     crosstab as crosstab,
+    cut as cut,
     from_dummies as from_dummies,
     get_dummies as get_dummies,
     lreshape as lreshape,
@@ -78,15 +79,10 @@ from pandas.core.reshape.api import (
     merge_asof as merge_asof,
     merge_ordered as merge_ordered,
     pivot as pivot,
+    pivot_table as pivot_table,
     qcut as qcut,
     wide_to_long as wide_to_long,
 )
-from pandas.core.reshape.api import (
-    cut as cut,  # pyright: ignore[reportUnknownVariableType]
-)
-from pandas.core.reshape.api import (
-    pivot_table as pivot_table,  # pyright: ignore[reportUnknownVariableType]
-)
 
 from pandas._config import (
     describe_option as describe_option,

pandas-stubs/core/frame.pyi

@@ -57,9 +57,7 @@ from pandas.core.indexing import (
     _LocIndexer,
 )
 from pandas.core.reshape.pivot import (
-    _PivotAggFunc,  # pyright: ignore[reportUnknownVariableType]
-)
-from pandas.core.reshape.pivot import (
+    _PivotAggFunc,
     _PivotTableColumnsTypes,
     _PivotTableIndexTypes,
     _PivotTableValuesTypes,

pandas-stubs/core/reshape/api.pyi

@@ -14,17 +14,11 @@ from pandas.core.reshape.merge import (
     merge_ordered as merge_ordered,
 )
 from pandas.core.reshape.pivot import (
-    crosstab as crosstab,  # pyright: ignore[reportUnknownVariableType]
-)
-from pandas.core.reshape.pivot import (
+    crosstab as crosstab,
     pivot as pivot,
-)
-from pandas.core.reshape.pivot import (
-    pivot_table as pivot_table,  # pyright: ignore[reportUnknownVariableType]
-)
-from pandas.core.reshape.tile import (
-    cut as cut,  # pyright: ignore[reportUnknownVariableType]
+    pivot_table as pivot_table,
 )
 from pandas.core.reshape.tile import (
+    cut as cut,
     qcut as qcut,
 )

pandas-stubs/core/reshape/pivot.pyi

@@ -34,8 +34,8 @@ from pandas._typing import (
 
 _PivotAggCallable: TypeAlias = Callable[[Series], ScalarT]
 
-_PivotAggFunc: TypeAlias = (  # pyright: ignore[reportUnknownVariableType]
-    _PivotAggCallable
+_PivotAggFunc: TypeAlias = (
+    _PivotAggCallable[ScalarT]
     | np.ufunc
     | Literal["mean", "sum", "count", "min", "max", "median", "std", "var"]
 )
@@ -66,11 +66,13 @@ _ExtendedAnyArrayLike: TypeAlias = AnyArrayLike | ArrayLike
 @overload
 def pivot_table(
     data: DataFrame,
-    values: _PivotTableValuesTypes = None,
-    index: _PivotTableIndexTypes = None,
-    columns: _PivotTableColumnsTypes = None,
+    values: _PivotTableValuesTypes[Hashable] = None,
+    index: _PivotTableIndexTypes[Hashable] = None,
+    columns: _PivotTableColumnsTypes[Hashable] = None,
     aggfunc: (
-        _PivotAggFunc | Sequence[_PivotAggFunc] | Mapping[Hashable, _PivotAggFunc]
+        _PivotAggFunc[Any]
+        | Sequence[_PivotAggFunc[Any]]
+        | Mapping[Hashable, _PivotAggFunc[Any]]
     ) = "mean",
     fill_value: Scalar | None = None,
     margins: bool = False,
@@ -84,12 +86,14 @@ def pivot_table(
 @overload
 def pivot_table(
     data: DataFrame,
-    values: _PivotTableValuesTypes = None,
+    values: _PivotTableValuesTypes[Hashable] = None,
     *,
     index: Grouper,
-    columns: _PivotTableColumnsTypes | np_ndarray | Index[Any] = None,
+    columns: _PivotTableColumnsTypes[Hashable] | np_ndarray | Index[Any] = None,
     aggfunc: (
-        _PivotAggFunc | Sequence[_PivotAggFunc] | Mapping[Hashable, _PivotAggFunc]
+        _PivotAggFunc[Any]
+        | Sequence[_PivotAggFunc[Any]]
+        | Mapping[Hashable, _PivotAggFunc[Any]]
     ) = "mean",
     fill_value: Scalar | None = None,
     margins: bool = False,
@@ -101,12 +105,14 @@ def pivot_table(
 @overload
 def pivot_table(
     data: DataFrame,
-    values: _PivotTableValuesTypes = None,
-    index: _PivotTableIndexTypes | np_ndarray | Index[Any] = None,
+    values: _PivotTableValuesTypes[Hashable] = None,
+    index: _PivotTableIndexTypes[Hashable] | np_ndarray | Index[Any] = None,
     *,
     columns: Grouper,
     aggfunc: (
-        _PivotAggFunc | Sequence[_PivotAggFunc] | Mapping[Hashable, _PivotAggFunc]
+        _PivotAggFunc[Any]
+        | Sequence[_PivotAggFunc[Any]]
+        | Mapping[Hashable, _PivotAggFunc[Any]]
     ) = "mean",
     fill_value: Scalar | None = None,
     margins: bool = False,

pandas-stubs/core/reshape/tile.pyi

@@ -1,5 +1,6 @@
 from collections.abc import Sequence
 from typing import (
+    Any,
     Literal,
     overload,
 )
@@ -102,7 +103,7 @@ def cut(
     include_lowest: bool = ...,
     duplicates: Literal["raise", "drop"] = ...,
     ordered: bool = ...,
-) -> tuple[Series, IntervalIndex]: ...
+) -> tuple[Series, IntervalIndex[Any]]: ...
 @overload
 def cut(
     x: Sequence[float] | np_ndarray_anyint | np_ndarray_float | Index,
@@ -132,7 +133,9 @@ def cut(
 @overload
 def cut(
     x: Sequence[float] | np_ndarray_anyint | np_ndarray_float | Index,
-    bins: int | Sequence[float] | Index[int] | Index[float] | IntervalIndex | Series,
+    bins: (
+        int | Sequence[float] | Index[int] | Index[float] | IntervalIndex[Any] | Series
+    ),
     right: bool = ...,
     *,
     labels: Literal[False],
@@ -163,7 +166,9 @@ def cut(
 @overload
 def cut(
     x: Series,
-    bins: int | Sequence[float] | Index[int] | Index[float] | IntervalIndex | Series,
+    bins: (
+        int | Sequence[float] | Index[int] | Index[float] | IntervalIndex[Any] | Series
+    ),
     right: bool = ...,
     labels: Literal[False] | Sequence[Label] | None = ...,
     retbins: Literal[False] = False,
@@ -175,7 +180,9 @@ def cut(
 @overload
 def cut(
     x: Sequence[float] | np_ndarray_anyint | np_ndarray_float | Index,
-    bins: int | Sequence[float] | Index[int] | Index[float] | IntervalIndex | Series,
+    bins: (
+        int | Sequence[float] | Index[int] | Index[float] | IntervalIndex[Any] | Series
+    ),
     right: bool = ...,
     labels: Sequence[Label] | None = ...,
     retbins: Literal[False] = False,

tests/test_pandas.py

@@ -1026,11 +1026,7 @@ def test_cut() -> None:
         labels=["1", "2", "3", "4"],
         retbins=True,
     )
-    m0, m1 = pd.cut(  # pyright: ignore[reportUnknownVariableType]
-        pd.Series([1, 2, 3, 4, 5, 6, 7, 8]),
-        intval_idx,
-        retbins=True,
-    )
+    m0, m1 = pd.cut(pd.Series([1, 2, 3, 4, 5, 6, 7, 8]), intval_idx, retbins=True)
     check(assert_type(j0, pd.Series), pd.Series)
     check(assert_type(j1, np_1darray_float), np_1darray, np.floating)
     check(assert_type(k0, pd.Series), pd.Series)