Skip to content

Commit 040bab0

Browse files
committed
groupby
1 parent 74f7a74 commit 040bab0

2 files changed

Lines changed: 15 additions & 19 deletions

File tree

pandas-stubs/core/groupby/generic.pyi

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ class SeriesGroupBy(GroupBy[Series[S2]], Generic[S2, ByT]):
7070
@overload
7171
def aggregate(
7272
self,
73-
func: Callable[[Series], C2] | Callable[Concatenate[Series, ...], C2],
73+
func: Callable[[Series], C2],
7474
/,
7575
*args: Any,
76-
engine: WindowingEngine = ...,
77-
engine_kwargs: WindowingEngineKwargs = ...,
76+
engine: WindowingEngine = None,
77+
engine_kwargs: WindowingEngineKwargs = None,
7878
**kwargs: Any,
7979
) -> Series[C2]: ...
8080
@overload
@@ -83,8 +83,8 @@ class SeriesGroupBy(GroupBy[Series[S2]], Generic[S2, ByT]):
8383
func: list[AggFuncTypeBase[...]],
8484
/,
8585
*args: Any,
86-
engine: WindowingEngine = ...,
87-
engine_kwargs: WindowingEngineKwargs = ...,
86+
engine: WindowingEngine = None,
87+
engine_kwargs: WindowingEngineKwargs = None,
8888
**kwargs: Any,
8989
) -> DataFrame: ...
9090
@overload
@@ -93,8 +93,8 @@ class SeriesGroupBy(GroupBy[Series[S2]], Generic[S2, ByT]):
9393
func: AggFuncTypeBase[...] | None = ...,
9494
/,
9595
*args: Any,
96-
engine: WindowingEngine = ...,
97-
engine_kwargs: WindowingEngineKwargs = ...,
96+
engine: WindowingEngine = None,
97+
engine_kwargs: WindowingEngineKwargs = None,
9898
**kwargs: Any,
9999
) -> Series: ...
100100
agg = aggregate
@@ -104,8 +104,8 @@ class SeriesGroupBy(GroupBy[Series[S2]], Generic[S2, ByT]):
104104
func: Callable[Concatenate[Series[S2], P], Series[S3]],
105105
/,
106106
*args: Any,
107-
engine: WindowingEngine = ...,
108-
engine_kwargs: WindowingEngineKwargs = ...,
107+
engine: WindowingEngine = None,
108+
engine_kwargs: WindowingEngineKwargs = None,
109109
**kwargs: Any,
110110
) -> Series[S3]: ...
111111
@overload
@@ -249,17 +249,17 @@ class DataFrameGroupBy(GroupBy[DataFrame], Generic[ByT, _TT]):
249249
self,
250250
func: Literal["size"],
251251
*args: Any,
252-
engine: WindowingEngine = ...,
253-
engine_kwargs: WindowingEngineKwargs = ...,
252+
engine: WindowingEngine = None,
253+
engine_kwargs: WindowingEngineKwargs = None,
254254
**kwargs: Any,
255255
) -> Series: ...
256256
@overload
257257
def aggregate(
258258
self,
259259
func: AggFuncTypeFrame[..., Any] | None = ...,
260260
*args: Any,
261-
engine: WindowingEngine = ...,
262-
engine_kwargs: WindowingEngineKwargs = ...,
261+
engine: WindowingEngine = None,
262+
engine_kwargs: WindowingEngineKwargs = None,
263263
**kwargs: Any,
264264
) -> DataFrame: ...
265265
@overload
@@ -275,8 +275,8 @@ class DataFrameGroupBy(GroupBy[DataFrame], Generic[ByT, _TT]):
275275
self,
276276
func: Callable[Concatenate[DataFrame, P], DataFrame],
277277
*args: Any,
278-
engine: WindowingEngine = ...,
279-
engine_kwargs: WindowingEngineKwargs = ...,
278+
engine: WindowingEngine = None,
279+
engine_kwargs: WindowingEngineKwargs = None,
280280
**kwargs: Any,
281281
) -> DataFrame: ...
282282
@overload

tests/frame/test_groupby.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -300,8 +300,6 @@ def test_types_groupby_agg() -> None:
300300
def wrapped_min(x: pd.Series[S1]) -> S1:
301301
return x.min()
302302

303-
# TODO: facebook/pyrefly#0
304-
# pyrefly: ignore[assert-type]
305303
check(assert_type(df.groupby("col1")["col3"].agg(min), pd.Series), pd.Series)
306304
check(
307305
assert_type(df.groupby("col1")["col3"].agg([min, max]), pd.DataFrame),
@@ -712,8 +710,6 @@ def test_getattr_and_dataframe_groupby() -> None:
712710
df = pd.DataFrame(
713711
data={"col1": [1, 1, 2], "col2": [3, 4, 5], "col3": [0, 1, 0], 0: [-1, -1, -1]}
714712
)
715-
# TODO: facebook/pyrefly#0
716-
# pyrefly: ignore[assert-type]
717713
check(assert_type(df.groupby("col1").col3.agg(min), pd.Series), pd.Series)
718714
check(
719715
assert_type(df.groupby("col1").col3.agg([min, max]), pd.DataFrame), pd.DataFrame

0 commit comments

Comments
 (0)