Skip to content

Commit 0eed2c8

Browse files
zorexsalvozhangbowen-coder
authored andcommitted
STY: use strict zip in pandas/tests/window (pandas-dev#62852)
1 parent bf598ce commit 0eed2c8

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

pandas/tests/window/test_cython_aggregations.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def _get_rolling_aggregations():
6262
]
6363
)
6464
# unzip to a list of 2 tuples, names and functions
65-
unzipped = list(zip(*named_roll_aggs))
65+
unzipped = list(zip(*named_roll_aggs, strict=True))
6666
return {"ids": unzipped[0], "params": unzipped[1]}
6767

6868

pandas/tests/window/test_expanding.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ def test_iter_expanding_dataframe(df, expected, min_periods):
180180
df = DataFrame(df)
181181
expecteds = [DataFrame(values, index=index) for (values, index) in expected]
182182

183-
for expected, actual in zip(expecteds, df.expanding(min_periods)):
183+
for expected, actual in zip(expecteds, df.expanding(min_periods), strict=False):
184184
tm.assert_frame_equal(actual, expected)
185185

186186

@@ -199,7 +199,7 @@ def test_iter_expanding_series(ser, expected, min_periods):
199199
# GH 11704
200200
expecteds = [Series(values, index=index) for (values, index) in expected]
201201

202-
for expected, actual in zip(expecteds, ser.expanding(min_periods)):
202+
for expected, actual in zip(expecteds, ser.expanding(min_periods), strict=True):
203203
tm.assert_series_equal(actual, expected)
204204

205205

pandas/tests/window/test_rolling.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,9 @@ def test_iter_rolling_dataframe(df, expected, window, min_periods):
764764
df = DataFrame(df)
765765
expecteds = [DataFrame(values, index=index) for (values, index) in expected]
766766

767-
for expected, actual in zip(expecteds, df.rolling(window, min_periods=min_periods)):
767+
for expected, actual in zip(
768+
expecteds, df.rolling(window, min_periods=min_periods), strict=False
769+
):
768770
tm.assert_frame_equal(actual, expected)
769771

770772

@@ -810,7 +812,7 @@ def test_iter_rolling_on_dataframe(expected, window):
810812
expecteds = [
811813
DataFrame(values, index=df.loc[index, "C"]) for (values, index) in expected
812814
]
813-
for expected, actual in zip(expecteds, df.rolling(window, on="C")):
815+
for expected, actual in zip(expecteds, df.rolling(window, on="C"), strict=False):
814816
tm.assert_frame_equal(actual, expected)
815817

816818

@@ -819,7 +821,7 @@ def test_iter_rolling_on_dataframe_unordered():
819821
df = DataFrame({"a": ["x", "y", "x"], "b": [0, 1, 2]})
820822
results = list(df.groupby("a").rolling(2))
821823
expecteds = [df.iloc[idx, [1]] for idx in [[0], [0, 2], [1]]]
822-
for result, expected in zip(results, expecteds):
824+
for result, expected in zip(results, expecteds, strict=True):
823825
tm.assert_frame_equal(result, expected)
824826

825827

@@ -861,7 +863,7 @@ def test_iter_rolling_series(ser, expected, window, min_periods):
861863
expecteds = [Series(values, index=index) for (values, index) in expected]
862864

863865
for expected, actual in zip(
864-
expecteds, ser.rolling(window, min_periods=min_periods)
866+
expecteds, ser.rolling(window, min_periods=min_periods), strict=True
865867
):
866868
tm.assert_series_equal(actual, expected)
867869

@@ -909,10 +911,11 @@ def test_iter_rolling_datetime(expected, expected_index, window):
909911
ser = Series(range(5), index=date_range(start="2020-01-01", periods=5, freq="D"))
910912

911913
expecteds = [
912-
Series(values, index=idx) for (values, idx) in zip(expected, expected_index)
914+
Series(values, index=idx)
915+
for (values, idx) in zip(expected, expected_index, strict=True)
913916
]
914917

915-
for expected, actual in zip(expecteds, ser.rolling(window)):
918+
for expected, actual in zip(expecteds, ser.rolling(window), strict=True):
916919
tm.assert_series_equal(actual, expected)
917920

918921

pyproject.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -591,9 +591,6 @@ exclude = [
591591
"pandas/tests/tseries/offsets/test_month.py" = ["B905"]
592592
"pandas/tests/tseries/offsets/test_offsets.py" = ["B905"]
593593
"pandas/tests/util/test_validate_kwargs.py" = ["B905"]
594-
"pandas/tests/window/test_cython_aggregations.py" = ["B905"]
595-
"pandas/tests/window/test_expanding.py" = ["B905"]
596-
"pandas/tests/window/test_rolling.py" = ["B905"]
597594
"scripts/validate_unwanted_patterns.py" = ["B905"]
598595

599596
[tool.ruff.lint.flake8-pytest-style]

0 commit comments

Comments
 (0)