Skip to content

Commit 9d1726a

Browse files
committed
groupby
1 parent 35aef78 commit 9d1726a

File tree

4 files changed

+16
-26
lines changed

4 files changed

+16
-26
lines changed

pandas-stubs/core/frame.pyi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1394,7 +1394,7 @@ class DataFrame(NDFrame, OpsMixin, _GetItemHack):
13941394
@overload
13951395
def groupby( # type: ignore[overload-overlap] # pyright: ignore reportOverlappingOverload
13961396
self,
1397-
by: MultiIndex | GroupByObjectNonScalar | None = ...,
1397+
by: MultiIndex | GroupByObjectNonScalar[Any] | None = ...,
13981398
level: IndexLabel | None = ...,
13991399
as_index: Literal[True] = True,
14001400
sort: _bool = ...,
@@ -1405,7 +1405,7 @@ class DataFrame(NDFrame, OpsMixin, _GetItemHack):
14051405
@overload
14061406
def groupby( # type: ignore[overload-overlap]
14071407
self,
1408-
by: MultiIndex | GroupByObjectNonScalar | None = ...,
1408+
by: MultiIndex | GroupByObjectNonScalar[Any] | None = ...,
14091409
level: IndexLabel | None = ...,
14101410
as_index: Literal[False] = False,
14111411
sort: _bool = ...,

tests/test_frame.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3626,17 +3626,13 @@ def test_groupby_result() -> None:
36263626
check(assert_type(value3, pd.DataFrame), pd.DataFrame)
36273627

36283628
# Want to make sure these cases are differentiated
3629-
for (_k1, _k2), _g in df.groupby( # pyright: ignore[reportUnknownVariableType]
3630-
["a", "b"]
3631-
):
3629+
for (_k1, _k2), _g in df.groupby(["a", "b"]):
36323630
pass
36333631

36343632
for _kk, _g in df.groupby("a"):
36353633
pass
36363634

3637-
for (_k1, _k2), _g in df.groupby( # pyright: ignore[reportUnknownVariableType]
3638-
multi_index
3639-
):
3635+
for (_k1, _k2), _g in df.groupby(multi_index):
36403636
pass
36413637

36423638

tests/test_io.py

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,26 @@
1919
HDFStore,
2020
Series,
2121
errors,
22+
read_clipboard,
23+
read_csv,
2224
read_feather,
2325
read_fwf,
2426
read_hdf,
27+
read_html,
2528
read_json,
29+
read_parquet,
2630
read_pickle,
2731
read_sas,
2832
read_spss,
33+
read_sql,
34+
read_sql_query,
2935
read_sql_table,
3036
read_stata,
37+
read_table,
38+
read_xml,
3139
)
40+
from pandas import read_excel # pyright: ignore[reportUnknownVariableType]
41+
from pandas import read_orc # pyright: ignore[reportUnknownVariableType]
3242
from pandas.api.typing import JsonReader
3343
import pytest
3444
import sqlalchemy
@@ -44,30 +54,14 @@
4454
)
4555
from tests import NUMPY20 # See https://github.com/PyTables/PyTables/issues/1172
4656

47-
from pandas.io.clipboards import read_clipboard
48-
from pandas.io.excel._base import (
49-
read_excel, # pyright: ignore[reportUnknownVariableType]
50-
)
51-
from pandas.io.html import read_html
52-
from pandas.io.orc import read_orc # pyright: ignore[reportUnknownVariableType]
53-
from pandas.io.parquet import read_parquet
5457
from pandas.io.parsers import TextFileReader
55-
from pandas.io.parsers.readers import (
56-
read_csv,
57-
read_table,
58-
)
5958
from pandas.io.pytables import (
6059
TableIterator,
6160
Term,
6261
)
6362
from pandas.io.sas.sas7bdat import SAS7BDATReader
6463
from pandas.io.sas.sas_xport import XportReader
65-
from pandas.io.sql import (
66-
read_sql,
67-
read_sql_query,
68-
)
6964
from pandas.io.stata import StataReader
70-
from pandas.io.xml import read_xml
7165

7266
DF = DataFrame({"a": [1, 2, 3], "b": [0.0, 0.0, 0.0]})
7367
CWD = Path(__file__).parent.resolve()

tests/test_plotting.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ def test_grouped_dataframe_boxplot(close_figures: None) -> None:
707707
df = pd.DataFrame(
708708
data=np.random.randn(len(index), 2), columns=["A", "B"], index=index
709709
)
710-
grouped = df.groupby(level="lvl1") # pyright: ignore[reportUnknownVariableType]
710+
grouped = df.groupby(level="lvl1")
711711

712712
# subplots (default is subplots=True)
713713
check(assert_type(grouped.boxplot(), Series), Series)
@@ -743,7 +743,7 @@ def test_grouped_dataframe_boxplot_single(close_figures: None) -> None:
743743
df = pd.DataFrame(
744744
data=np.random.randn(len(index), 2), columns=["A", "B"], index=index
745745
)
746-
grouped = df.groupby(level="lvl1") # pyright: ignore[reportUnknownVariableType]
746+
grouped = df.groupby(level="lvl1")
747747

748748
# a single plot
749749
check(

0 commit comments

Comments
 (0)