Skip to content

Commit 44f0e32

Browse files
authored
Rewrite dict literal for files in tests/groupby & ./pandas/tests/dtypes (#38205)
1 parent b687883 commit 44f0e32

File tree

3 files changed

+37
-29
lines changed

3 files changed

+37
-29
lines changed

pandas/tests/dtypes/test_inference.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def coerce(request):
6868
((1,), True, "tuple"),
6969
(tuple(), True, "tuple-empty"),
7070
({"a": 1}, True, "dict"),
71-
(dict(), True, "dict-empty"),
71+
({}, True, "dict-empty"),
7272
({"a", 1}, "set", "set"),
7373
(set(), "set", "set-empty"),
7474
(frozenset({"a", 1}), "set", "frozenset"),
@@ -1489,7 +1489,7 @@ def test_datetimeindex_from_empty_datetime64_array():
14891489
def test_nan_to_nat_conversions():
14901490

14911491
df = DataFrame(
1492-
dict({"A": np.asarray(range(10), dtype="float64"), "B": Timestamp("20010101")})
1492+
{"A": np.asarray(range(10), dtype="float64"), "B": Timestamp("20010101")}
14931493
)
14941494
df.iloc[3:6, :] = np.nan
14951495
result = df.loc[4, "B"]

pandas/tests/groupby/test_function.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -692,14 +692,14 @@ def test_cummin(numpy_dtypes_for_minmax):
692692
tm.assert_frame_equal(result, expected)
693693

694694
# GH 15561
695-
df = DataFrame(dict(a=[1], b=pd.to_datetime(["2001"])))
695+
df = DataFrame({"a": [1], "b": pd.to_datetime(["2001"])})
696696
expected = Series(pd.to_datetime("2001"), index=[0], name="b")
697697

698698
result = df.groupby("a")["b"].cummin()
699699
tm.assert_series_equal(expected, result)
700700

701701
# GH 15635
702-
df = DataFrame(dict(a=[1, 2, 1], b=[1, 2, 2]))
702+
df = DataFrame({"a": [1, 2, 1], "b": [1, 2, 2]})
703703
result = df.groupby("a").b.cummin()
704704
expected = Series([1, 2, 1], name="b")
705705
tm.assert_series_equal(result, expected)
@@ -748,14 +748,14 @@ def test_cummax(numpy_dtypes_for_minmax):
748748
tm.assert_frame_equal(result, expected)
749749

750750
# GH 15561
751-
df = DataFrame(dict(a=[1], b=pd.to_datetime(["2001"])))
751+
df = DataFrame({"a": [1], "b": pd.to_datetime(["2001"])})
752752
expected = Series(pd.to_datetime("2001"), index=[0], name="b")
753753

754754
result = df.groupby("a")["b"].cummax()
755755
tm.assert_series_equal(expected, result)
756756

757757
# GH 15635
758-
df = DataFrame(dict(a=[1, 2, 1], b=[2, 1, 1]))
758+
df = DataFrame({"a": [1, 2, 1], "b": [2, 1, 1]})
759759
result = df.groupby("a").b.cummax()
760760
expected = Series([2, 1, 2], name="b")
761761
tm.assert_series_equal(result, expected)

pandas/tests/groupby/transform/test_transform.py

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ def test_transform_dtype():
228228
def test_transform_bug():
229229
# GH 5712
230230
# transforming on a datetime column
231-
df = DataFrame(dict(A=Timestamp("20130101"), B=np.arange(5)))
231+
df = DataFrame({"A": Timestamp("20130101"), "B": np.arange(5)})
232232
result = df.groupby("A")["B"].transform(lambda x: x.rank(ascending=False))
233233
expected = Series(np.arange(5, 0, step=-1), name="B")
234234
tm.assert_series_equal(result, expected)
@@ -251,7 +251,7 @@ def test_transform_numeric_to_boolean():
251251
def test_transform_datetime_to_timedelta():
252252
# GH 15429
253253
# transforming a datetime to timedelta
254-
df = DataFrame(dict(A=Timestamp("20130101"), B=np.arange(5)))
254+
df = DataFrame({"A": Timestamp("20130101"), "B": np.arange(5)})
255255
expected = Series([Timestamp("20130101") - Timestamp("20130101")] * 5, name="A")
256256

257257
# this does date math without changing result type in transform
@@ -442,7 +442,7 @@ def test_transform_coercion():
442442
# 14457
443443
# when we are transforming be sure to not coerce
444444
# via assignment
445-
df = DataFrame(dict(A=["a", "a"], B=[0, 1]))
445+
df = DataFrame({"A": ["a", "a"], "B": [0, 1]})
446446
g = df.groupby("A")
447447

448448
expected = g.transform(np.mean)
@@ -456,43 +456,50 @@ def test_groupby_transform_with_int():
456456

457457
# floats
458458
df = DataFrame(
459-
dict(
460-
A=[1, 1, 1, 2, 2, 2],
461-
B=Series(1, dtype="float64"),
462-
C=Series([1, 2, 3, 1, 2, 3], dtype="float64"),
463-
D="foo",
464-
)
459+
{
460+
"A": [1, 1, 1, 2, 2, 2],
461+
"B": Series(1, dtype="float64"),
462+
"C": Series([1, 2, 3, 1, 2, 3], dtype="float64"),
463+
"D": "foo",
464+
}
465465
)
466466
with np.errstate(all="ignore"):
467467
result = df.groupby("A").transform(lambda x: (x - x.mean()) / x.std())
468468
expected = DataFrame(
469-
dict(B=np.nan, C=Series([-1, 0, 1, -1, 0, 1], dtype="float64"))
469+
{"B": np.nan, "C": Series([-1, 0, 1, -1, 0, 1], dtype="float64")}
470470
)
471471
tm.assert_frame_equal(result, expected)
472472

473473
# int case
474-
df = DataFrame(dict(A=[1, 1, 1, 2, 2, 2], B=1, C=[1, 2, 3, 1, 2, 3], D="foo"))
474+
df = DataFrame(
475+
{
476+
"A": [1, 1, 1, 2, 2, 2],
477+
"B": 1,
478+
"C": [1, 2, 3, 1, 2, 3],
479+
"D": "foo",
480+
}
481+
)
475482
with np.errstate(all="ignore"):
476483
result = df.groupby("A").transform(lambda x: (x - x.mean()) / x.std())
477-
expected = DataFrame(dict(B=np.nan, C=[-1, 0, 1, -1, 0, 1]))
484+
expected = DataFrame({"B": np.nan, "C": [-1, 0, 1, -1, 0, 1]})
478485
tm.assert_frame_equal(result, expected)
479486

480487
# int that needs float conversion
481488
s = Series([2, 3, 4, 10, 5, -1])
482-
df = DataFrame(dict(A=[1, 1, 1, 2, 2, 2], B=1, C=s, D="foo"))
489+
df = DataFrame({"A": [1, 1, 1, 2, 2, 2], "B": 1, "C": s, "D": "foo"})
483490
with np.errstate(all="ignore"):
484491
result = df.groupby("A").transform(lambda x: (x - x.mean()) / x.std())
485492

486493
s1 = s.iloc[0:3]
487494
s1 = (s1 - s1.mean()) / s1.std()
488495
s2 = s.iloc[3:6]
489496
s2 = (s2 - s2.mean()) / s2.std()
490-
expected = DataFrame(dict(B=np.nan, C=concat([s1, s2])))
497+
expected = DataFrame({"B": np.nan, "C": concat([s1, s2])})
491498
tm.assert_frame_equal(result, expected)
492499

493500
# int downcasting
494501
result = df.groupby("A").transform(lambda x: x * 2 / 2)
495-
expected = DataFrame(dict(B=1, C=[2, 3, 4, 10, 5, -1]))
502+
expected = DataFrame({"B": 1, "C": [2, 3, 4, 10, 5, -1]})
496503
tm.assert_frame_equal(result, expected)
497504

498505

@@ -659,11 +666,11 @@ def test_cython_transform_frame(op, args, targop):
659666
# group by values, index level, columns
660667
for df in [df, df2]:
661668
for gb_target in [
662-
dict(by=labels),
663-
dict(level=0),
664-
dict(by="string"),
665-
]: # dict(by='string_missing')]:
666-
# dict(by=['int','string'])]:
669+
{"by": labels},
670+
{"level": 0},
671+
{"by": "string"},
672+
]: # {"by": 'string_missing'}]:
673+
# {"by": ['int','string']}]:
667674

668675
gb = df.groupby(**gb_target)
669676
# allowlisted methods set the selection before applying
@@ -986,7 +993,7 @@ def test_transform_absent_categories(func):
986993
x_vals = [1]
987994
x_cats = range(2)
988995
y = [1]
989-
df = DataFrame(dict(x=Categorical(x_vals, x_cats), y=y))
996+
df = DataFrame({"x": Categorical(x_vals, x_cats), "y": y})
990997
result = getattr(df.y.groupby(df.x), func)()
991998
expected = df.y
992999
tm.assert_series_equal(result, expected)
@@ -1005,7 +1012,7 @@ def test_ffill_not_in_axis(func, key, val):
10051012

10061013
def test_transform_invalid_name_raises():
10071014
# GH#27486
1008-
df = DataFrame(dict(a=[0, 1, 1, 2]))
1015+
df = DataFrame({"a": [0, 1, 1, 2]})
10091016
g = df.groupby(["a", "b", "b", "c"])
10101017
with pytest.raises(ValueError, match="not a valid function name"):
10111018
g.transform("some_arbitrary_name")
@@ -1025,7 +1032,8 @@ def test_transform_invalid_name_raises():
10251032
"obj",
10261033
[
10271034
DataFrame(
1028-
dict(a=[0, 0, 0, 1, 1, 1], b=range(6)), index=["A", "B", "C", "D", "E", "F"]
1035+
{"a": [0, 0, 0, 1, 1, 1], "b": range(6)},
1036+
index=["A", "B", "C", "D", "E", "F"],
10291037
),
10301038
Series([0, 0, 0, 1, 1, 1], index=["A", "B", "C", "D", "E", "F"]),
10311039
],

0 commit comments

Comments
 (0)