Skip to content

Commit df9fc86

Browse files
MarcoGorelliMarcoGorelli
authored
remove (deprecated) axis from group_by (#1320)
* remove (deprecated) `axis` from `group_by` * remove outdated tests * remove from series too
1 parent 6f479f6 commit df9fc86

File tree

3 files changed

+0
-32
lines changed

3 files changed

+0
-32
lines changed

‎pandas-stubs/core/frame.pyi‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1148,7 +1148,6 @@ class DataFrame(NDFrame, OpsMixin, _GetItemHack):
11481148
def groupby( # pyright: ignore reportOverlappingOverload
11491149
self,
11501150
by: Scalar,
1151-
axis: AxisIndex | _NoDefaultDoNotUse = ...,
11521151
level: IndexLabel | None = ...,
11531152
as_index: Literal[True] = True,
11541153
sort: _bool = ...,
@@ -1160,7 +1159,6 @@ class DataFrame(NDFrame, OpsMixin, _GetItemHack):
11601159
def groupby(
11611160
self,
11621161
by: Scalar,
1163-
axis: AxisIndex | _NoDefaultDoNotUse = ...,
11641162
level: IndexLabel | None = ...,
11651163
as_index: Literal[False] = ...,
11661164
sort: _bool = ...,
@@ -1172,7 +1170,6 @@ class DataFrame(NDFrame, OpsMixin, _GetItemHack):
11721170
def groupby( # pyright: ignore reportOverlappingOverload
11731171
self,
11741172
by: DatetimeIndex,
1175-
axis: AxisIndex | _NoDefaultDoNotUse = ...,
11761173
level: IndexLabel | None = ...,
11771174
as_index: Literal[True] = True,
11781175
sort: _bool = ...,
@@ -1184,7 +1181,6 @@ class DataFrame(NDFrame, OpsMixin, _GetItemHack):
11841181
def groupby( # pyright: ignore reportOverlappingOverload
11851182
self,
11861183
by: DatetimeIndex,
1187-
axis: AxisIndex | _NoDefaultDoNotUse = ...,
11881184
level: IndexLabel | None = ...,
11891185
as_index: Literal[False] = ...,
11901186
sort: _bool = ...,
@@ -1196,7 +1192,6 @@ class DataFrame(NDFrame, OpsMixin, _GetItemHack):
11961192
def groupby( # pyright: ignore reportOverlappingOverload
11971193
self,
11981194
by: TimedeltaIndex,
1199-
axis: AxisIndex | _NoDefaultDoNotUse = ...,
12001195
level: IndexLabel | None = ...,
12011196
as_index: Literal[True] = True,
12021197
sort: _bool = ...,
@@ -1208,7 +1203,6 @@ class DataFrame(NDFrame, OpsMixin, _GetItemHack):
12081203
def groupby(
12091204
self,
12101205
by: TimedeltaIndex,
1211-
axis: AxisIndex | _NoDefaultDoNotUse = ...,
12121206
level: IndexLabel | None = ...,
12131207
as_index: Literal[False] = ...,
12141208
sort: _bool = ...,
@@ -1220,7 +1214,6 @@ class DataFrame(NDFrame, OpsMixin, _GetItemHack):
12201214
def groupby( # pyright: ignore reportOverlappingOverload
12211215
self,
12221216
by: PeriodIndex,
1223-
axis: AxisIndex | _NoDefaultDoNotUse = ...,
12241217
level: IndexLabel | None = ...,
12251218
as_index: Literal[True] = True,
12261219
sort: _bool = ...,
@@ -1232,7 +1225,6 @@ class DataFrame(NDFrame, OpsMixin, _GetItemHack):
12321225
def groupby(
12331226
self,
12341227
by: PeriodIndex,
1235-
axis: AxisIndex | _NoDefaultDoNotUse = ...,
12361228
level: IndexLabel | None = ...,
12371229
as_index: Literal[False] = ...,
12381230
sort: _bool = ...,
@@ -1244,7 +1236,6 @@ class DataFrame(NDFrame, OpsMixin, _GetItemHack):
12441236
def groupby( # pyright: ignore reportOverlappingOverload
12451237
self,
12461238
by: IntervalIndex[IntervalT],
1247-
axis: AxisIndex | _NoDefaultDoNotUse = ...,
12481239
level: IndexLabel | None = ...,
12491240
as_index: Literal[True] = True,
12501241
sort: _bool = ...,
@@ -1256,7 +1247,6 @@ class DataFrame(NDFrame, OpsMixin, _GetItemHack):
12561247
def groupby(
12571248
self,
12581249
by: IntervalIndex[IntervalT],
1259-
axis: AxisIndex | _NoDefaultDoNotUse = ...,
12601250
level: IndexLabel | None = ...,
12611251
as_index: Literal[False] = ...,
12621252
sort: _bool = ...,
@@ -1268,7 +1258,6 @@ class DataFrame(NDFrame, OpsMixin, _GetItemHack):
12681258
def groupby( # type: ignore[overload-overlap] # pyright: ignore reportOverlappingOverload
12691259
self,
12701260
by: MultiIndex | GroupByObjectNonScalar | None = ...,
1271-
axis: AxisIndex | _NoDefaultDoNotUse = ...,
12721261
level: IndexLabel | None = ...,
12731262
as_index: Literal[True] = True,
12741263
sort: _bool = ...,
@@ -1280,7 +1269,6 @@ class DataFrame(NDFrame, OpsMixin, _GetItemHack):
12801269
def groupby( # type: ignore[overload-overlap]
12811270
self,
12821271
by: MultiIndex | GroupByObjectNonScalar | None = ...,
1283-
axis: AxisIndex | _NoDefaultDoNotUse = ...,
12841272
level: IndexLabel | None = ...,
12851273
as_index: Literal[False] = ...,
12861274
sort: _bool = ...,
@@ -1292,7 +1280,6 @@ class DataFrame(NDFrame, OpsMixin, _GetItemHack):
12921280
def groupby( # pyright: ignore reportOverlappingOverload
12931281
self,
12941282
by: Series[SeriesByT],
1295-
axis: AxisIndex | _NoDefaultDoNotUse = ...,
12961283
level: IndexLabel | None = ...,
12971284
as_index: Literal[True] = True,
12981285
sort: _bool = ...,
@@ -1304,7 +1291,6 @@ class DataFrame(NDFrame, OpsMixin, _GetItemHack):
13041291
def groupby(
13051292
self,
13061293
by: Series[SeriesByT],
1307-
axis: AxisIndex | _NoDefaultDoNotUse = ...,
13081294
level: IndexLabel | None = ...,
13091295
as_index: Literal[False] = ...,
13101296
sort: _bool = ...,
@@ -1316,7 +1302,6 @@ class DataFrame(NDFrame, OpsMixin, _GetItemHack):
13161302
def groupby(
13171303
self,
13181304
by: CategoricalIndex | Index | Series,
1319-
axis: AxisIndex | _NoDefaultDoNotUse = ...,
13201305
level: IndexLabel | None = ...,
13211306
as_index: Literal[True] = True,
13221307
sort: _bool = ...,
@@ -1328,7 +1313,6 @@ class DataFrame(NDFrame, OpsMixin, _GetItemHack):
13281313
def groupby(
13291314
self,
13301315
by: CategoricalIndex | Index | Series,
1331-
axis: AxisIndex | _NoDefaultDoNotUse = ...,
13321316
level: IndexLabel | None = ...,
13331317
as_index: Literal[False] = ...,
13341318
sort: _bool = ...,

‎pandas-stubs/core/series.pyi‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,6 @@ class Series(IndexOpsMixin[S1], NDFrame):
626626
def groupby(
627627
self,
628628
by: Scalar,
629-
axis: AxisIndex = ...,
630629
level: IndexLabel | None = ...,
631630
as_index: _bool = ...,
632631
sort: _bool = ...,
@@ -638,7 +637,6 @@ class Series(IndexOpsMixin[S1], NDFrame):
638637
def groupby(
639638
self,
640639
by: DatetimeIndex,
641-
axis: AxisIndex = ...,
642640
level: IndexLabel | None = ...,
643641
as_index: _bool = ...,
644642
sort: _bool = ...,
@@ -650,7 +648,6 @@ class Series(IndexOpsMixin[S1], NDFrame):
650648
def groupby(
651649
self,
652650
by: TimedeltaIndex,
653-
axis: AxisIndex = ...,
654651
level: IndexLabel | None = ...,
655652
as_index: _bool = ...,
656653
sort: _bool = ...,
@@ -662,7 +659,6 @@ class Series(IndexOpsMixin[S1], NDFrame):
662659
def groupby(
663660
self,
664661
by: PeriodIndex,
665-
axis: AxisIndex = ...,
666662
level: IndexLabel | None = ...,
667663
as_index: _bool = ...,
668664
sort: _bool = ...,
@@ -674,7 +670,6 @@ class Series(IndexOpsMixin[S1], NDFrame):
674670
def groupby(
675671
self,
676672
by: IntervalIndex[IntervalT],
677-
axis: AxisIndex = ...,
678673
level: IndexLabel | None = ...,
679674
as_index: _bool = ...,
680675
sort: _bool = ...,
@@ -686,7 +681,6 @@ class Series(IndexOpsMixin[S1], NDFrame):
686681
def groupby(
687682
self,
688683
by: MultiIndex | GroupByObjectNonScalar,
689-
axis: AxisIndex = ...,
690684
level: IndexLabel | None = ...,
691685
as_index: _bool = ...,
692686
sort: _bool = ...,
@@ -698,7 +692,6 @@ class Series(IndexOpsMixin[S1], NDFrame):
698692
def groupby(
699693
self,
700694
by: None,
701-
axis: AxisIndex,
702695
level: IndexLabel, # level is required when by=None (passed as positional)
703696
as_index: _bool = ...,
704697
sort: _bool = ...,
@@ -710,7 +703,6 @@ class Series(IndexOpsMixin[S1], NDFrame):
710703
def groupby(
711704
self,
712705
by: None = ...,
713-
axis: AxisIndex = ...,
714706
*,
715707
level: IndexLabel, # level is required when by=None (passed as keyword)
716708
as_index: _bool = ...,
@@ -723,7 +715,6 @@ class Series(IndexOpsMixin[S1], NDFrame):
723715
def groupby(
724716
self,
725717
by: Series[SeriesByT],
726-
axis: AxisIndex = ...,
727718
level: IndexLabel | None = ...,
728719
as_index: _bool = ...,
729720
sort: _bool = ...,
@@ -735,7 +726,6 @@ class Series(IndexOpsMixin[S1], NDFrame):
735726
def groupby(
736727
self,
737728
by: CategoricalIndex | Index | Series,
738-
axis: AxisIndex = ...,
739729
level: IndexLabel | None = ...,
740730
as_index: _bool = ...,
741731
sort: _bool = ...,

‎tests/test_frame.py‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -688,9 +688,6 @@ def test_types_mean() -> None:
688688
assert_type(df.mean(axis=1, skipna=True, numeric_only=False), pd.Series),
689689
pd.Series,
690690
)
691-
if TYPE_CHECKING_INVALID_USAGE:
692-
df3: pd.DataFrame = df.groupby(axis=1, level=0).mean() # type: ignore[call-overload] # pyright: ignore[reportArgumentType, reportCallIssue]
693-
df4: pd.DataFrame = df.groupby(axis=1, level=0, dropna=True).mean() # type: ignore[call-overload] # pyright: ignore[reportArgumentType, reportCallIssue]
694691

695692

696693
def test_types_median() -> None:
@@ -702,9 +699,6 @@ def test_types_median() -> None:
702699
assert_type(df.median(axis=1, skipna=True, numeric_only=False), pd.Series),
703700
pd.Series,
704701
)
705-
if TYPE_CHECKING_INVALID_USAGE:
706-
df3: pd.DataFrame = df.groupby(axis=1, level=0).median() # type: ignore[call-overload] # pyright: ignore[reportArgumentType, reportCallIssue]
707-
df4: pd.DataFrame = df.groupby(axis=1, level=0, dropna=True).median() # type: ignore[call-overload] # pyright: ignore[reportArgumentType, reportCallIssue]
708702

709703

710704
def test_types_iterrows() -> None:

0 commit comments

Comments
 (0)