Skip to content
Next Next commit
TYP: Remove deprecated inplace for set_index
  • Loading branch information
bashtage committed Sep 2, 2022
commit e812d1a7076977a9f17f17f95930cbaff451ffec
5 changes: 0 additions & 5 deletions pandas-stubs/core/frame.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -645,8 +645,6 @@ class DataFrame(NDFrame, OpsMixin):
drop: _bool = ...,
append: _bool = ...,
verify_integrity: _bool = ...,
*,
inplace: Literal[True],
) -> None: ...
@overload
def set_index(
Expand All @@ -660,8 +658,6 @@ class DataFrame(NDFrame, OpsMixin):
drop: _bool = ...,
append: _bool = ...,
verify_integrity: _bool = ...,
*,
inplace: Literal[False],
) -> DataFrame: ...
@overload
def set_index(
Expand All @@ -688,7 +684,6 @@ class DataFrame(NDFrame, OpsMixin):
| list[HashableT],
drop: _bool = ...,
append: _bool = ...,
inplace: _bool | None = ...,
verify_integrity: _bool = ...,
) -> DataFrame | None: ...
@overload
Expand Down
18 changes: 12 additions & 6 deletions tests/test_frame.py
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,6 @@ def test_types_set_index() -> None:
res3: pd.DataFrame = df.set_index("col1", append=True)
res4: pd.DataFrame = df.set_index("col1", verify_integrity=True)
res5: pd.DataFrame = df.set_index(["col1", "col2"])
res6: None = df.set_index("col1", inplace=True)
# GH 140
res7: pd.DataFrame = df.set_index(pd.Index(["w", "x", "y", "z"]))

Expand Down Expand Up @@ -1505,27 +1504,31 @@ def test_frame_scalars_slice() -> None:

# Note: bool_ cannot be tested since the index is object and pandas does not
# support boolean access using loc except when the index is boolean
check(assert_type(df.loc[str_], pd.Series), pd.Series)
with pytest.warns(FutureWarning, match="Comparison of Timestamp with datetime"):
check(assert_type(df.loc[str_], pd.Series), pd.Series)
check(assert_type(df.loc[bytes_], pd.Series), pd.Series)
check(assert_type(df.loc[date], pd.Series), pd.Series)
check(assert_type(df.loc[datetime_], pd.Series), pd.Series)
check(assert_type(df.loc[timedelta], pd.Series), pd.Series)
check(assert_type(df.loc[int_], pd.Series), pd.Series)
check(assert_type(df.loc[float_], pd.Series), pd.Series)
check(assert_type(df.loc[complex_], pd.Series), pd.Series)
check(assert_type(df.loc[timestamp], pd.Series), pd.Series)
with pytest.warns(FutureWarning, match="Comparison of Timestamp with datetime"):
check(assert_type(df.loc[timestamp], pd.Series), pd.Series)
check(assert_type(df.loc[pd_timedelta], pd.Series), pd.Series)
check(assert_type(df.loc[none], pd.Series), pd.Series)

check(assert_type(df.loc[:, str_], pd.Series), pd.Series)
with pytest.warns(FutureWarning, match="Comparison of Timestamp with datetime"):
check(assert_type(df.loc[:, str_], pd.Series), pd.Series)
check(assert_type(df.loc[:, bytes_], pd.Series), pd.Series)
check(assert_type(df.loc[:, date], pd.Series), pd.Series)
check(assert_type(df.loc[:, datetime_], pd.Series), pd.Series)
check(assert_type(df.loc[:, timedelta], pd.Series), pd.Series)
check(assert_type(df.loc[:, int_], pd.Series), pd.Series)
check(assert_type(df.loc[:, float_], pd.Series), pd.Series)
check(assert_type(df.loc[:, complex_], pd.Series), pd.Series)
check(assert_type(df.loc[:, timestamp], pd.Series), pd.Series)
with pytest.warns(FutureWarning, match="Comparison of Timestamp with datetime"):
check(assert_type(df.loc[:, timestamp], pd.Series), pd.Series)
check(assert_type(df.loc[:, pd_timedelta], pd.Series), pd.Series)
check(assert_type(df.loc[:, none], pd.Series), pd.Series)

Expand Down Expand Up @@ -1635,7 +1638,10 @@ def sample_to_df(x: pd.DataFrame) -> pd.DataFrame:
return x.sample()

check(
assert_type(df.groupby("col1").apply(sample_to_df), pd.DataFrame), pd.DataFrame
assert_type(
df.groupby("col1").apply(sample_to_df, group_keys=True), pd.DataFrame
),
pd.DataFrame,
)


Expand Down