CLEAN: Align Groupby types (#166)

Author: Dr-Irv

pandas-stubs/core/base.pyi

@@ -1,24 +1,18 @@
 from __future__ import annotations
 
 from typing import (
-    Callable,
     Generic,
     Literal,
 )
 
 import numpy as np
-from pandas import (
-    DataFrame,
-    Index,
-    Series,
-)
+from pandas import Index
 from pandas.core.accessor import DirNamesMixin
 from pandas.core.arrays import ExtensionArray
 from pandas.core.arrays.categorical import Categorical
 
 from pandas._typing import (
     NDFrameT,
-    Scalar,
     SeriesAxisType,
 )
 
@@ -35,10 +29,6 @@ class SpecificationError(GroupByError): ...
 class SelectionMixin(Generic[NDFrameT]):
     def ndim(self) -> int: ...
     def __getitem__(self, key): ...
-    def aggregate(
-        self, func: Callable | None = ..., *args, **kwargs
-    ) -> Scalar | Series | DataFrame: ...
-    agg = aggregate
 
 class ShallowMixin: ...
 

pandas-stubs/core/groupby/groupby.pyi

@@ -2,7 +2,10 @@ from __future__ import annotations
 
 from typing import Callable
 
-from pandas.core.base import PandasObject
+from pandas.core.base import (
+    PandasObject,
+    SelectionMixin,
+)
 from pandas.core.frame import DataFrame
 from pandas.core.generic import NDFrame
 from pandas.core.groupby import ops
@@ -14,14 +17,15 @@ from pandas._typing import (
     AxisType,
     FrameOrSeriesUnion,
     KeysArgType,
+    NDFrameT,
 )
 
 class GroupByPlot(PandasObject):
     def __init__(self, groupby) -> None: ...
     def __call__(self, *args, **kwargs): ...
     def __getattr__(self, name: str): ...
 
-class _GroupBy(PandasObject, GroupByIndexingMixin):
+class BaseGroupBy(PandasObject, SelectionMixin[NDFrameT], GroupByIndexingMixin):
     level = ...
     as_index = ...
     keys = ...
@@ -63,7 +67,7 @@ class _GroupBy(PandasObject, GroupByIndexingMixin):
     def get_group(self, name, obj: DataFrame | None = ...) -> DataFrame: ...
     def apply(self, func: Callable, *args, **kwargs) -> FrameOrSeriesUnion: ...
 
-class GroupBy(_GroupBy):
+class GroupBy(BaseGroupBy[NDFrameT]):
     def count(self) -> FrameOrSeriesUnion: ...
     def mean(self, **kwargs) -> FrameOrSeriesUnion: ...
     def median(self, **kwargs) -> FrameOrSeriesUnion: ...

pandas-stubs/core/resample.pyi

@@ -2,12 +2,12 @@ from __future__ import annotations
 
 from pandas.core.base import ShallowMixin as ShallowMixin
 from pandas.core.groupby.base import GroupByMixin as GroupByMixin
-from pandas.core.groupby.groupby import _GroupBy
+from pandas.core.groupby.groupby import BaseGroupBy
 from pandas.core.groupby.grouper import Grouper as Grouper
 
 from pandas._typing import FrameOrSeriesUnion
 
-class Resampler(_GroupBy, ShallowMixin):
+class Resampler(BaseGroupBy, ShallowMixin):
     def __init__(
         self, obj, groupby=..., axis: int = ..., kind=..., **kwargs
     ) -> None: ...