Skip to content

Commit e43d75e

Browse files
Fix: Reanme duplicate function names in unittests (pandas-dev#48906)
* Fix: Reanme duplicate function names in unittests * Fix: Reanme duplicate function names in unittests * Fix: Reanme duplicate function names in unittests
1 parent cfeed03 commit e43d75e

File tree

6 files changed

+30
-36
lines changed

6 files changed

+30
-36
lines changed

pandas/tests/groupby/aggregate/test_aggregate.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,8 @@ def test_groupby_mixed_cols_axis1(func, expected_data, result_dtype_dict):
281281
def test_aggregate_item_by_item(df):
282282
grouped = df.groupby("A")
283283

284-
aggfun = lambda ser: ser.size
285-
result = grouped.agg(aggfun)
284+
aggfun_0 = lambda ser: ser.size
285+
result = grouped.agg(aggfun_0)
286286
foo = (df.A == "foo").sum()
287287
bar = (df.A == "bar").sum()
288288
K = len(result.columns)
@@ -294,10 +294,10 @@ def test_aggregate_item_by_item(df):
294294
exp = Series(np.array([bar] * K), index=list("BCD"), name="bar")
295295
tm.assert_almost_equal(result.xs("bar"), exp)
296296

297-
def aggfun(ser):
297+
def aggfun_1(ser):
298298
return ser.size
299299

300-
result = DataFrame().groupby(df.A).agg(aggfun)
300+
result = DataFrame().groupby(df.A).agg(aggfun_1)
301301
assert isinstance(result, DataFrame)
302302
assert len(result) == 0
303303

pandas/tests/groupby/test_groupby.py

+14-16
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,10 @@ def max_value(group):
112112
def test_groupby_return_type():
113113

114114
# GH2893, return a reduced type
115+
116+
def func(dataf):
117+
return dataf["val2"] - dataf["val2"].mean()
118+
115119
df1 = DataFrame(
116120
[
117121
{"val1": 1, "val2": 20},
@@ -121,9 +125,6 @@ def test_groupby_return_type():
121125
]
122126
)
123127

124-
def func(dataf):
125-
return dataf["val2"] - dataf["val2"].mean()
126-
127128
with tm.assert_produces_warning(FutureWarning):
128129
result = df1.groupby("val1", squeeze=True).apply(func)
129130
assert isinstance(result, Series)
@@ -137,9 +138,6 @@ def func(dataf):
137138
]
138139
)
139140

140-
def func(dataf):
141-
return dataf["val2"] - dataf["val2"].mean()
142-
143141
with tm.assert_produces_warning(FutureWarning):
144142
result = df2.groupby("val1", squeeze=True).apply(func)
145143
assert isinstance(result, Series)
@@ -162,51 +160,51 @@ def test_inconsistent_return_type():
162160
}
163161
)
164162

165-
def f(grp):
163+
def f_0(grp):
166164
return grp.iloc[0]
167165

168166
expected = df.groupby("A").first()[["B"]]
169-
result = df.groupby("A").apply(f)[["B"]]
167+
result = df.groupby("A").apply(f_0)[["B"]]
170168
tm.assert_frame_equal(result, expected)
171169

172-
def f(grp):
170+
def f_1(grp):
173171
if grp.name == "Tiger":
174172
return None
175173
return grp.iloc[0]
176174

177-
result = df.groupby("A").apply(f)[["B"]]
175+
result = df.groupby("A").apply(f_1)[["B"]]
178176
e = expected.copy()
179177
e.loc["Tiger"] = np.nan
180178
tm.assert_frame_equal(result, e)
181179

182-
def f(grp):
180+
def f_2(grp):
183181
if grp.name == "Pony":
184182
return None
185183
return grp.iloc[0]
186184

187-
result = df.groupby("A").apply(f)[["B"]]
185+
result = df.groupby("A").apply(f_2)[["B"]]
188186
e = expected.copy()
189187
e.loc["Pony"] = np.nan
190188
tm.assert_frame_equal(result, e)
191189

192190
# 5592 revisited, with datetimes
193-
def f(grp):
191+
def f_3(grp):
194192
if grp.name == "Pony":
195193
return None
196194
return grp.iloc[0]
197195

198-
result = df.groupby("A").apply(f)[["C"]]
196+
result = df.groupby("A").apply(f_3)[["C"]]
199197
e = df.groupby("A").first()[["C"]]
200198
e.loc["Pony"] = pd.NaT
201199
tm.assert_frame_equal(result, e)
202200

203201
# scalar outputs
204-
def f(grp):
202+
def f_4(grp):
205203
if grp.name == "Pony":
206204
return None
207205
return grp.iloc[0].loc["C"]
208206

209-
result = df.groupby("A").apply(f)
207+
result = df.groupby("A").apply(f_4)
210208
e = df.groupby("A").first()["C"].copy()
211209
e.loc["Pony"] = np.nan
212210
e.name = None

pandas/tests/io/pytables/test_append.py

-3
Original file line numberDiff line numberDiff line change
@@ -437,9 +437,6 @@ def check_col(key, name, size):
437437

438438
with ensure_clean_store(setup_path) as store:
439439

440-
def check_col(key, name, size):
441-
assert getattr(store.get_storer(key).table.description, name).itemsize, size
442-
443440
df = DataFrame({"A": "foo", "B": "bar"}, index=range(10))
444441

445442
# a min_itemsize that creates a data_column

pandas/tests/resample/test_resampler_grouper.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ def test_deferred_with_groupby():
6565
df = DataFrame(data, columns=["date", "id", "score"])
6666
df.date = pd.to_datetime(df.date)
6767

68-
def f(x):
68+
def f_0(x):
6969
return x.set_index("date").resample("D").asfreq()
7070

71-
expected = df.groupby("id").apply(f)
71+
expected = df.groupby("id").apply(f_0)
7272
result = df.set_index("date").groupby("id").resample("D").asfreq()
7373
tm.assert_frame_equal(result, expected)
7474

@@ -80,10 +80,10 @@ def f(x):
8080
}
8181
).set_index("date")
8282

83-
def f(x):
83+
def f_1(x):
8484
return x.resample("1D").ffill()
8585

86-
expected = df.groupby("group").apply(f)
86+
expected = df.groupby("group").apply(f_1)
8787
result = df.groupby("group").resample("1D").ffill()
8888
tm.assert_frame_equal(result, expected)
8989

@@ -257,16 +257,16 @@ def test_apply():
257257
# reduction
258258
expected = g.resample("2s").sum()
259259

260-
def f(x):
260+
def f_0(x):
261261
return x.resample("2s").sum()
262262

263-
result = r.apply(f)
263+
result = r.apply(f_0)
264264
tm.assert_frame_equal(result, expected)
265265

266-
def f(x):
266+
def f_1(x):
267267
return x.resample("2s").apply(lambda y: y.sum())
268268

269-
result = g.apply(f)
269+
result = g.apply(f_1)
270270
# y.sum() results in int64 instead of int32 on 32-bit architectures
271271
expected = expected.astype("int64")
272272
tm.assert_frame_equal(result, expected)

pandas/tests/window/test_groupby.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1064,10 +1064,10 @@ def test_expanding_corr_cov(self, f):
10641064

10651065
result = getattr(r, f)(self.frame)
10661066

1067-
def func(x):
1067+
def func_0(x):
10681068
return getattr(x.expanding(), f)(self.frame)
10691069

1070-
expected = g.apply(func)
1070+
expected = g.apply(func_0)
10711071
# GH 39591: groupby.apply returns 1 instead of nan for windows
10721072
# with all nan values
10731073
null_idx = list(range(20, 61)) + list(range(72, 113))
@@ -1079,10 +1079,10 @@ def func(x):
10791079

10801080
result = getattr(r.B, f)(pairwise=True)
10811081

1082-
def func(x):
1082+
def func_1(x):
10831083
return getattr(x.B.expanding(), f)(pairwise=True)
10841084

1085-
expected = g.apply(func)
1085+
expected = g.apply(func_1)
10861086
tm.assert_series_equal(result, expected)
10871087

10881088
def test_expanding_apply(self, raw):

pyproject.toml

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ disable = [
4141
"access-member-before-definition",
4242
"bad-super-call",
4343
"c-extension-no-member",
44-
"function-redefined",
4544
"import-error",
4645
"invalid-repr-returned",
4746
"invalid-unary-operand-type",

0 commit comments

Comments
 (0)