Skip to content

Commit 1c35fba

Browse files
Sangarshananjreback
authored andcommitted
CLN: Replace fstring in tests/groupby/*.py files (#30700)
1 parent cf400f9 commit 1c35fba

10 files changed

+19
-27
lines changed

pandas/tests/groupby/aggregate/test_other.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -473,8 +473,7 @@ def test_agg_timezone_round_trip():
473473
assert result3 == ts
474474

475475
dates = [
476-
pd.Timestamp("2016-01-0{i:d} 12:00:00".format(i=i), tz="US/Pacific")
477-
for i in range(1, 5)
476+
pd.Timestamp(f"2016-01-0{i:d} 12:00:00", tz="US/Pacific") for i in range(1, 5)
478477
]
479478
df = pd.DataFrame({"A": ["a", "b"] * 2, "B": dates})
480479
grouped = df.groupby("A")

pandas/tests/groupby/test_apply.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ def desc3(group):
265265
result = group.describe()
266266

267267
# names are different
268-
result.index.name = "stat_{:d}".format(len(group))
268+
result.index.name = f"stat_{len(group):d}"
269269

270270
result = result[: len(group)]
271271
# weirdo

pandas/tests/groupby/test_bin_groupby.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def _check(dtype):
8787
counts = np.zeros(len(out), dtype=np.int64)
8888
labels = ensure_int64(np.repeat(np.arange(3), np.diff(np.r_[0, bins])))
8989

90-
func = getattr(groupby, "group_ohlc_{dtype}".format(dtype=dtype))
90+
func = getattr(groupby, f"group_ohlc_{dtype}")
9191
func(out, counts, obj[:, None], labels)
9292

9393
def _ohlc(group):

pandas/tests/groupby/test_categorical.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -497,10 +497,10 @@ def test_dataframe_categorical_ordered_observed_sort(ordered, observed, sort):
497497
aggr[aggr.isna()] = "missing"
498498
if not all(label == aggr):
499499
msg = (
500-
"Labels and aggregation results not consistently sorted\n"
501-
+ "for (ordered={}, observed={}, sort={})\n"
502-
+ "Result:\n{}"
503-
).format(ordered, observed, sort, result)
500+
f"Labels and aggregation results not consistently sorted\n"
501+
+ "for (ordered={ordered}, observed={observed}, sort={sort})\n"
502+
+ "Result:\n{result}"
503+
)
504504
assert False, msg
505505

506506

@@ -805,7 +805,7 @@ def test_sort():
805805
# self.cat.groupby(['value_group'])['value_group'].count().plot(kind='bar')
806806

807807
df = DataFrame({"value": np.random.randint(0, 10000, 100)})
808-
labels = ["{0} - {1}".format(i, i + 499) for i in range(0, 10000, 500)]
808+
labels = [f"{i} - {i+499}" for i in range(0, 10000, 500)]
809809
cat_labels = Categorical(labels, labels)
810810

811811
df = df.sort_values(by=["value"], ascending=True)

pandas/tests/groupby/test_counting.py

+2-5
Original file line numberDiff line numberDiff line change
@@ -197,11 +197,8 @@ def test_ngroup_respects_groupby_order(self):
197197
@pytest.mark.parametrize(
198198
"datetimelike",
199199
[
200-
[
201-
Timestamp("2016-05-{i:02d} 20:09:25+00:00".format(i=i))
202-
for i in range(1, 4)
203-
],
204-
[Timestamp("2016-05-{i:02d} 20:09:25".format(i=i)) for i in range(1, 4)],
200+
[Timestamp(f"2016-05-{i:02d} 20:09:25+00:00") for i in range(1, 4)],
201+
[Timestamp(f"2016-05-{i:02d} 20:09:25") for i in range(1, 4)],
205202
[Timedelta(x, unit="h") for x in range(1, 4)],
206203
[Period(freq="2W", year=2017, month=x) for x in range(1, 4)],
207204
],

pandas/tests/groupby/test_function.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,7 @@ def test_builtins_apply(keys, f):
103103
result = df.groupby(keys).apply(f)
104104
ngroups = len(df.drop_duplicates(subset=keys))
105105

106-
assert_msg = "invalid frame shape: {} (expected ({}, 3))".format(
107-
result.shape, ngroups
108-
)
106+
assert_msg = f"invalid frame shape: {result.shape} (expected ({ngroups}, 3))"
109107
assert result.shape == (ngroups, 3), assert_msg
110108

111109
tm.assert_frame_equal(

pandas/tests/groupby/test_groupby.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -935,7 +935,7 @@ def test_mutate_groups():
935935
+ ["c"] * 2
936936
+ ["d"] * 2
937937
+ ["e"] * 2,
938-
"cat3": ["g{}".format(x) for x in range(1, 15)],
938+
"cat3": [f"g{x}" for x in range(1, 15)],
939939
"val": np.random.randint(100, size=14),
940940
}
941941
)

pandas/tests/groupby/test_transform.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -962,9 +962,7 @@ def demean_rename(x):
962962
if isinstance(x, pd.Series):
963963
return result
964964

965-
result = result.rename(
966-
columns={c: "{}_demeaned".format(c) for c in result.columns}
967-
)
965+
result = result.rename(columns={c: "{c}_demeaned" for c in result.columns})
968966

969967
return result
970968

pandas/tests/groupby/test_value_counts.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def seed_df(seed_nans, n, m):
4747
keys = "1st", "2nd", ["1st", "2nd"]
4848
for k, b in product(keys, bins):
4949
binned.append((df, k, b, n, m))
50-
ids.append("{}-{}-{}".format(k, n, m))
50+
ids.append(f"{k}-{n}-{m}")
5151

5252

5353
@pytest.mark.slow

pandas/tests/groupby/test_whitelist.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ def test_all_methods_categorized(mframe):
404404

405405
# new public method?
406406
if new_names:
407-
msg = """
407+
msg = f"""
408408
There are uncatgeorized methods defined on the Grouper class:
409409
{names}.
410410
@@ -418,19 +418,19 @@ def test_all_methods_categorized(mframe):
418418
see the comments in pandas/core/groupby/base.py for guidance on
419419
how to fix this test.
420420
"""
421-
raise AssertionError(msg.format(names=names))
421+
raise AssertionError(msg)
422422

423423
# removed a public method?
424424
all_categorized = reduction_kernels | transformation_kernels | groupby_other_methods
425425
print(names)
426426
print(all_categorized)
427427
if not (names == all_categorized):
428-
msg = """
428+
msg = f"""
429429
Some methods which are supposed to be on the Grouper class
430430
are missing:
431-
{names}.
431+
{all_categorized - names}.
432432
433433
They're still defined in one of the lists that live in pandas/core/groupby/base.py.
434434
If you removed a method, you should update them
435435
"""
436-
raise AssertionError(msg.format(names=all_categorized - names))
436+
raise AssertionError(msg)

0 commit comments

Comments
 (0)