Skip to content

Commit 7ced65d

Browse files
committed
Inline check(assert_type(...)) calls
1 parent 0f38baa commit 7ced65d

File tree

2 files changed

+48
-31
lines changed

2 files changed

+48
-31
lines changed

tests/test_frame.py

Lines changed: 34 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1960,25 +1960,41 @@ def test_types_rename_axis() -> None:
19601960
df.index.name = "a"
19611961
df.columns.name = "b"
19621962

1963-
for _df in [
1964-
# Rename axes with `mapper` and `axis`
1965-
df.rename_axis("A"),
1966-
df.rename_axis(["A"]),
1967-
df.rename_axis(None),
1968-
df.rename_axis("B", axis=1),
1969-
df.rename_axis(["B"], axis=1),
1970-
df.rename_axis(None, axis=1),
1971-
# Rename axes with `index` and `columns`
1972-
df.rename_axis(index="A", columns="B"),
1973-
df.rename_axis(index=["A"], columns=["B"]),
1974-
df.rename_axis(index={"a": "A"}, columns={"b": "B"}),
1975-
df.rename_axis(
1976-
index=lambda name: name.upper(),
1977-
columns=lambda name: name.upper(),
1963+
# Rename axes with `mapper` and `axis`
1964+
check(assert_type(df.rename_axis("A"), pd.DataFrame), pd.DataFrame)
1965+
check(assert_type(df.rename_axis(["A"]), pd.DataFrame), pd.DataFrame)
1966+
check(assert_type(df.rename_axis(None), pd.DataFrame), pd.DataFrame)
1967+
check(assert_type(df.rename_axis("B", axis=1), pd.DataFrame), pd.DataFrame)
1968+
check(assert_type(df.rename_axis(["B"], axis=1), pd.DataFrame), pd.DataFrame)
1969+
check(assert_type(df.rename_axis(None, axis=1), pd.DataFrame), pd.DataFrame)
1970+
1971+
# Rename axes with `index` and `columns`
1972+
check(
1973+
assert_type(df.rename_axis(index="A", columns="B"), pd.DataFrame),
1974+
pd.DataFrame,
1975+
)
1976+
check(
1977+
assert_type(df.rename_axis(index=["A"], columns=["B"]), pd.DataFrame),
1978+
pd.DataFrame,
1979+
)
1980+
check(
1981+
assert_type(df.rename_axis(index={"a": "A"}, columns={"b": "B"}), pd.DataFrame),
1982+
pd.DataFrame,
1983+
)
1984+
check(
1985+
assert_type(
1986+
df.rename_axis(
1987+
index=lambda name: name.upper(),
1988+
columns=lambda name: name.upper(),
1989+
),
1990+
pd.DataFrame,
19781991
),
1979-
df.rename_axis(index=None, columns=None),
1980-
]:
1981-
check(assert_type(_df, pd.DataFrame), pd.DataFrame)
1992+
pd.DataFrame,
1993+
)
1994+
check(
1995+
assert_type(df.rename_axis(index=None, columns=None), pd.DataFrame),
1996+
pd.DataFrame,
1997+
)
19821998

19831999

19842000
def test_types_eq() -> None:

tests/test_series.py

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1124,19 +1124,20 @@ def test_types_rename_axis() -> None:
11241124
s = pd.Series([1, 2, 3])
11251125
s.index.name = "a"
11261126

1127-
for _s in [
1128-
# Rename index with `mapper`
1129-
s.rename_axis("A"),
1130-
s.rename_axis(["A"]),
1131-
s.rename_axis(None),
1132-
# Rename index with `index`
1133-
s.rename_axis(index="A"),
1134-
s.rename_axis(index=["A"]),
1135-
s.rename_axis(index={"a": "A"}),
1136-
s.rename_axis(index=lambda name: name.upper()),
1137-
s.rename_axis(index=None),
1138-
]:
1139-
check(assert_type(_s, pd.Series[int]), pd.Series[int])
1127+
# Rename index with `mapper`
1128+
check(assert_type(s.rename_axis("A"), "pd.Series[int]"), pd.Series)
1129+
check(assert_type(s.rename_axis(["A"]), "pd.Series[int]"), pd.Series)
1130+
check(assert_type(s.rename_axis(None), "pd.Series[int]"), pd.Series)
1131+
1132+
# Rename index with `index`
1133+
check(assert_type(s.rename_axis(index="A"), "pd.Series[int]"), pd.Series)
1134+
check(assert_type(s.rename_axis(index=["A"]), "pd.Series[int]"), pd.Series)
1135+
check(assert_type(s.rename_axis(index={"a": "A"}), "pd.Series[int]"), pd.Series)
1136+
check(
1137+
assert_type(s.rename_axis(index=lambda name: name.upper()), "pd.Series[int]"),
1138+
pd.Series,
1139+
)
1140+
check(assert_type(s.rename_axis(index=None), "pd.Series[int]"), pd.Series)
11401141

11411142

11421143
def test_types_values() -> None:

0 commit comments

Comments
 (0)