Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 24 additions & 34 deletions tests/test_frame.py
Original file line number Diff line number Diff line change
Expand Up @@ -881,12 +881,7 @@ def test_types_groupby() -> None:
df4: pd.DataFrame = df.groupby(by=["col1", "col2"]).count()
df5: pd.DataFrame = df.groupby(by=["col1", "col2"]).filter(lambda x: x["col1"] > 0)
df6: pd.DataFrame = df.groupby(by=["col1", "col2"]).nunique()
with pytest_warns_bounded(
FutureWarning,
match="DataFrameGroupBy.apply operated on the grouping columns. This behavior is deprecated",
lower="2.0.99",
):
df7: pd.DataFrame = df.groupby(by="col1").apply(sum)
df7: pd.DataFrame = df.groupby(by="col1").apply(sum)
df8: pd.DataFrame = df.groupby("col1").transform("sum")
s1: pd.Series = df.set_index("col1")["col2"]
s2: pd.Series = s1.groupby("col1").transform("sum")
Expand Down Expand Up @@ -2053,41 +2048,36 @@ def test_groupby_apply() -> None:
def sum_mean(x: pd.DataFrame) -> float:
return x.sum().mean()

with pytest_warns_bounded(
FutureWarning,
match="DataFrameGroupBy.apply operated on the grouping columns. This behavior is deprecated",
lower="2.0.99",
):
check(assert_type(df.groupby("col1").apply(sum_mean), pd.Series), pd.Series)
check(assert_type(df.groupby("col1").apply(sum_mean), pd.Series), pd.Series)

lfunc: Callable[[pd.DataFrame], float] = lambda x: x.sum().mean()
check(
assert_type(df.groupby("col1").apply(lfunc), pd.Series),
pd.Series,
)
lfunc: Callable[[pd.DataFrame], float] = lambda x: x.sum().mean()
check(
assert_type(df.groupby("col1").apply(lfunc), pd.Series),
pd.Series,
)

def sum_to_list(x: pd.DataFrame) -> list:
return x.sum().tolist()
def sum_to_list(x: pd.DataFrame) -> list:
return x.sum().tolist()

check(assert_type(df.groupby("col1").apply(sum_to_list), pd.Series), pd.Series)
check(assert_type(df.groupby("col1").apply(sum_to_list), pd.Series), pd.Series)

def sum_to_series(x: pd.DataFrame) -> pd.Series:
return x.sum()
def sum_to_series(x: pd.DataFrame) -> pd.Series:
return x.sum()

check(
assert_type(df.groupby("col1").apply(sum_to_series), pd.DataFrame),
pd.DataFrame,
)
check(
assert_type(df.groupby("col1").apply(sum_to_series), pd.DataFrame),
pd.DataFrame,
)

def sample_to_df(x: pd.DataFrame) -> pd.DataFrame:
return x.sample()
def sample_to_df(x: pd.DataFrame) -> pd.DataFrame:
return x.sample()

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


def test_resample() -> None:
Expand Down
19 changes: 16 additions & 3 deletions tests/test_styler.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@
import pytest
from typing_extensions import assert_type

from tests import check
from tests import (
check,
pytest_warns_bounded,
)

from pandas.io.formats.style import Styler

Expand Down Expand Up @@ -70,14 +73,24 @@ def test_applymap() -> None:
def g(o: object) -> str:
return str(o)

check(assert_type(DF.style.applymap(g), Styler), Styler)
with pytest_warns_bounded(
FutureWarning,
match="Styler.applymap has been deprecated. Use Styler.map instead.",
lower="2.0.99",
):
check(assert_type(DF.style.applymap(g), Styler), Styler)


def test_applymap_index() -> None:
def g(o: object) -> str:
return str(o)

check(assert_type(DF.style.applymap_index(g), Styler), Styler)
with pytest_warns_bounded(
FutureWarning,
match="Styler.applymap_index has been deprecated. Use Styler.map_index instead.",
lower="2.0.99",
):
check(assert_type(DF.style.applymap_index(g), Styler), Styler)


def test_background_gradient() -> None:
Expand Down