Skip to content

Commit c7626b1

Browse files
authored
Tst return none inplace series (#35210)
1 parent 0534b00 commit c7626b1

10 files changed

+74
-37
lines changed

pandas/tests/series/indexing/test_indexing.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -736,14 +736,16 @@ def test_append_timedelta_does_not_cast(td):
736736
def test_underlying_data_conversion():
737737
# GH 4080
738738
df = DataFrame({c: [1, 2, 3] for c in ["a", "b", "c"]})
739-
df.set_index(["a", "b", "c"], inplace=True)
739+
return_value = df.set_index(["a", "b", "c"], inplace=True)
740+
assert return_value is None
740741
s = Series([1], index=[(2, 2, 2)])
741742
df["val"] = 0
742743
df
743744
df["val"].update(s)
744745

745746
expected = DataFrame(dict(a=[1, 2, 3], b=[1, 2, 3], c=[1, 2, 3], val=[0, 1, 0]))
746-
expected.set_index(["a", "b", "c"], inplace=True)
747+
return_value = expected.set_index(["a", "b", "c"], inplace=True)
748+
assert return_value is None
747749
tm.assert_frame_equal(df, expected)
748750

749751
# GH 3970

pandas/tests/series/methods/test_drop_duplicates.py

+22-11
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ def test_drop_duplicates(any_numpy_dtype, keep, expected):
2222
tm.assert_series_equal(tc.duplicated(keep=keep), expected)
2323
tm.assert_series_equal(tc.drop_duplicates(keep=keep), tc[~expected])
2424
sc = tc.copy()
25-
sc.drop_duplicates(keep=keep, inplace=True)
25+
return_value = sc.drop_duplicates(keep=keep, inplace=True)
26+
assert return_value is None
2627
tm.assert_series_equal(sc, tc[~expected])
2728

2829

@@ -40,8 +41,9 @@ def test_drop_duplicates_bool(keep, expected):
4041
tm.assert_series_equal(tc.duplicated(keep=keep), expected)
4142
tm.assert_series_equal(tc.drop_duplicates(keep=keep), tc[~expected])
4243
sc = tc.copy()
43-
sc.drop_duplicates(keep=keep, inplace=True)
44+
return_value = sc.drop_duplicates(keep=keep, inplace=True)
4445
tm.assert_series_equal(sc, tc[~expected])
46+
assert return_value is None
4547

4648

4749
@pytest.mark.parametrize("values", [[], list(range(5))])
@@ -84,21 +86,24 @@ def test_drop_duplicates_categorical_non_bool(self, dtype, ordered):
8486
tm.assert_series_equal(tc1.duplicated(), expected)
8587
tm.assert_series_equal(tc1.drop_duplicates(), tc1[~expected])
8688
sc = tc1.copy()
87-
sc.drop_duplicates(inplace=True)
89+
return_value = sc.drop_duplicates(inplace=True)
90+
assert return_value is None
8891
tm.assert_series_equal(sc, tc1[~expected])
8992

9093
expected = Series([False, False, True, False])
9194
tm.assert_series_equal(tc1.duplicated(keep="last"), expected)
9295
tm.assert_series_equal(tc1.drop_duplicates(keep="last"), tc1[~expected])
9396
sc = tc1.copy()
94-
sc.drop_duplicates(keep="last", inplace=True)
97+
return_value = sc.drop_duplicates(keep="last", inplace=True)
98+
assert return_value is None
9599
tm.assert_series_equal(sc, tc1[~expected])
96100

97101
expected = Series([False, False, True, True])
98102
tm.assert_series_equal(tc1.duplicated(keep=False), expected)
99103
tm.assert_series_equal(tc1.drop_duplicates(keep=False), tc1[~expected])
100104
sc = tc1.copy()
101-
sc.drop_duplicates(keep=False, inplace=True)
105+
return_value = sc.drop_duplicates(keep=False, inplace=True)
106+
assert return_value is None
102107
tm.assert_series_equal(sc, tc1[~expected])
103108

104109
# Test case 2
@@ -113,21 +118,24 @@ def test_drop_duplicates_categorical_non_bool(self, dtype, ordered):
113118
tm.assert_series_equal(tc2.duplicated(), expected)
114119
tm.assert_series_equal(tc2.drop_duplicates(), tc2[~expected])
115120
sc = tc2.copy()
116-
sc.drop_duplicates(inplace=True)
121+
return_value = sc.drop_duplicates(inplace=True)
122+
assert return_value is None
117123
tm.assert_series_equal(sc, tc2[~expected])
118124

119125
expected = Series([False, True, True, False, False, False, False])
120126
tm.assert_series_equal(tc2.duplicated(keep="last"), expected)
121127
tm.assert_series_equal(tc2.drop_duplicates(keep="last"), tc2[~expected])
122128
sc = tc2.copy()
123-
sc.drop_duplicates(keep="last", inplace=True)
129+
return_value = sc.drop_duplicates(keep="last", inplace=True)
130+
assert return_value is None
124131
tm.assert_series_equal(sc, tc2[~expected])
125132

126133
expected = Series([False, True, True, False, True, True, False])
127134
tm.assert_series_equal(tc2.duplicated(keep=False), expected)
128135
tm.assert_series_equal(tc2.drop_duplicates(keep=False), tc2[~expected])
129136
sc = tc2.copy()
130-
sc.drop_duplicates(keep=False, inplace=True)
137+
return_value = sc.drop_duplicates(keep=False, inplace=True)
138+
assert return_value is None
131139
tm.assert_series_equal(sc, tc2[~expected])
132140

133141
def test_drop_duplicates_categorical_bool(self, ordered):
@@ -141,19 +149,22 @@ def test_drop_duplicates_categorical_bool(self, ordered):
141149
tm.assert_series_equal(tc.duplicated(), expected)
142150
tm.assert_series_equal(tc.drop_duplicates(), tc[~expected])
143151
sc = tc.copy()
144-
sc.drop_duplicates(inplace=True)
152+
return_value = sc.drop_duplicates(inplace=True)
153+
assert return_value is None
145154
tm.assert_series_equal(sc, tc[~expected])
146155

147156
expected = Series([True, True, False, False])
148157
tm.assert_series_equal(tc.duplicated(keep="last"), expected)
149158
tm.assert_series_equal(tc.drop_duplicates(keep="last"), tc[~expected])
150159
sc = tc.copy()
151-
sc.drop_duplicates(keep="last", inplace=True)
160+
return_value = sc.drop_duplicates(keep="last", inplace=True)
161+
assert return_value is None
152162
tm.assert_series_equal(sc, tc[~expected])
153163

154164
expected = Series([True, True, True, True])
155165
tm.assert_series_equal(tc.duplicated(keep=False), expected)
156166
tm.assert_series_equal(tc.drop_duplicates(keep=False), tc[~expected])
157167
sc = tc.copy()
158-
sc.drop_duplicates(keep=False, inplace=True)
168+
return_value = sc.drop_duplicates(keep=False, inplace=True)
169+
assert return_value is None
159170
tm.assert_series_equal(sc, tc[~expected])

pandas/tests/series/methods/test_fillna.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ def test_fillna_numeric_inplace(self):
6767
x = Series([np.nan, 1.0, np.nan, 3.0, np.nan], ["z", "a", "b", "c", "d"])
6868
y = x.copy()
6969

70-
y.fillna(value=0, inplace=True)
70+
return_value = y.fillna(value=0, inplace=True)
71+
assert return_value is None
7172

7273
expected = x.fillna(value=0)
7374
tm.assert_series_equal(y, expected)

pandas/tests/series/methods/test_replace.py

+16-8
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ def test_replace(self, datetime_series):
1313
ser[6:10] = 0
1414

1515
# replace list with a single value
16-
ser.replace([np.nan], -1, inplace=True)
16+
return_value = ser.replace([np.nan], -1, inplace=True)
17+
assert return_value is None
1718

1819
exp = ser.fillna(-1)
1920
tm.assert_series_equal(ser, exp)
@@ -48,7 +49,8 @@ def test_replace(self, datetime_series):
4849
tm.assert_series_equal(rs, rs2)
4950

5051
# replace inplace
51-
ser.replace([np.nan, "foo", "bar"], -1, inplace=True)
52+
return_value = ser.replace([np.nan, "foo", "bar"], -1, inplace=True)
53+
assert return_value is None
5254

5355
assert (ser[:5] == -1).all()
5456
assert (ser[6:10] == -1).all()
@@ -124,7 +126,8 @@ def test_replace_with_single_list(self):
124126
tm.assert_series_equal(result, pd.Series([0, 0, 0, 0, 4]))
125127

126128
s = ser.copy()
127-
s.replace([1, 2, 3], inplace=True)
129+
return_value = s.replace([1, 2, 3], inplace=True)
130+
assert return_value is None
128131
tm.assert_series_equal(s, pd.Series([0, 0, 0, 0, 4]))
129132

130133
# make sure things don't get corrupted when fillna call fails
@@ -134,7 +137,8 @@ def test_replace_with_single_list(self):
134137
r"\(bfill\)\. Got crash_cymbal"
135138
)
136139
with pytest.raises(ValueError, match=msg):
137-
s.replace([1, 2, 3], inplace=True, method="crash_cymbal")
140+
return_value = s.replace([1, 2, 3], inplace=True, method="crash_cymbal")
141+
assert return_value is None
138142
tm.assert_series_equal(s, ser)
139143

140144
def test_replace_with_empty_list(self):
@@ -156,7 +160,8 @@ def test_replace_mixed_types(self):
156160
def check_replace(to_rep, val, expected):
157161
sc = s.copy()
158162
r = s.replace(to_rep, val)
159-
sc.replace(to_rep, val, inplace=True)
163+
return_value = sc.replace(to_rep, val, inplace=True)
164+
assert return_value is None
160165
tm.assert_series_equal(expected, r)
161166
tm.assert_series_equal(expected, sc)
162167

@@ -242,7 +247,8 @@ def test_replace2(self):
242247
tm.assert_series_equal(rs, rs2)
243248

244249
# replace inplace
245-
ser.replace([np.nan, "foo", "bar"], -1, inplace=True)
250+
return_value = ser.replace([np.nan, "foo", "bar"], -1, inplace=True)
251+
assert return_value is None
246252
assert (ser[:5] == -1).all()
247253
assert (ser[6:10] == -1).all()
248254
assert (ser[20:30] == -1).all()
@@ -325,11 +331,13 @@ def test_replace_categorical_single(self):
325331
tm.assert_series_equal(expected, result)
326332
assert c[2] != "foo" # ensure non-inplace call does not alter original
327333

328-
c.replace(c[2], "foo", inplace=True)
334+
return_value = c.replace(c[2], "foo", inplace=True)
335+
assert return_value is None
329336
tm.assert_series_equal(expected, c)
330337

331338
first_value = c[0]
332-
c.replace(c[1], c[0], inplace=True)
339+
return_value = c.replace(c[1], c[0], inplace=True)
340+
assert return_value is None
333341
assert c[0] == c[1] == first_value # test replacing with existing value
334342

335343
def test_replace_with_no_overflowerror(self):

pandas/tests/series/methods/test_reset_index.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ def test_reset_index(self):
2222
# check inplace
2323
s = ser.reset_index(drop=True)
2424
s2 = ser
25-
s2.reset_index(drop=True, inplace=True)
25+
return_value = s2.reset_index(drop=True, inplace=True)
26+
assert return_value is None
2627
tm.assert_series_equal(s, s2)
2728

2829
# level

pandas/tests/series/methods/test_sort_values.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ def test_sort_values(self, datetime_series):
6565

6666
# inplace=True
6767
ts = datetime_series.copy()
68-
ts.sort_values(ascending=False, inplace=True)
68+
return_value = ts.sort_values(ascending=False, inplace=True)
69+
assert return_value is None
6970
tm.assert_series_equal(ts, datetime_series.sort_values(ascending=False))
7071
tm.assert_index_equal(
7172
ts.index, datetime_series.sort_values(ascending=False).index

pandas/tests/series/methods/test_truncate.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@ def test_truncate_multiindex(self):
136136
df = pd.DataFrame.from_dict(
137137
{"L1": [2, 2, 3, 3], "L2": ["A", "B", "A", "B"], "col": [2, 3, 4, 5]}
138138
)
139-
df.set_index(["L1", "L2"], inplace=True)
139+
return_value = df.set_index(["L1", "L2"], inplace=True)
140+
assert return_value is None
140141
expected = df.col
141142

142143
tm.assert_series_equal(result, expected)

pandas/tests/series/test_api.py

+12-6
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,8 @@ def test_constructor_dict_timedelta_index(self):
179179

180180
def test_sparse_accessor_updates_on_inplace(self):
181181
s = pd.Series([1, 1, 2, 3], dtype="Sparse[int]")
182-
s.drop([0, 1], inplace=True)
182+
return_value = s.drop([0, 1], inplace=True)
183+
assert return_value is None
183184
assert s.sparse.density == 1.0
184185

185186
def test_tab_completion(self):
@@ -459,7 +460,8 @@ def f(x):
459460

460461
def test_str_accessor_updates_on_inplace(self):
461462
s = pd.Series(list("abc"))
462-
s.drop([0], inplace=True)
463+
return_value = s.drop([0], inplace=True)
464+
assert return_value is None
463465
assert len(s.str.lower()) == 2
464466

465467
def test_str_attribute(self):
@@ -548,7 +550,8 @@ def test_cat_accessor(self):
548550
assert not s.cat.ordered, False
549551

550552
exp = Categorical(["a", "b", np.nan, "a"], categories=["b", "a"])
551-
s.cat.set_categories(["b", "a"], inplace=True)
553+
return_value = s.cat.set_categories(["b", "a"], inplace=True)
554+
assert return_value is None
552555
tm.assert_categorical_equal(s.values, exp)
553556

554557
res = s.cat.set_categories(["b", "a"])
@@ -579,8 +582,10 @@ def test_cat_accessor_no_new_attributes(self):
579582

580583
def test_cat_accessor_updates_on_inplace(self):
581584
s = Series(list("abc")).astype("category")
582-
s.drop(0, inplace=True)
583-
s.cat.remove_unused_categories(inplace=True)
585+
return_value = s.drop(0, inplace=True)
586+
assert return_value is None
587+
return_value = s.cat.remove_unused_categories(inplace=True)
588+
assert return_value is None
584589
assert len(s.cat.categories) == 2
585590

586591
def test_categorical_delegations(self):
@@ -614,7 +619,8 @@ def test_categorical_delegations(self):
614619
assert s.cat.ordered
615620
s = s.cat.as_unordered()
616621
assert not s.cat.ordered
617-
s.cat.as_ordered(inplace=True)
622+
return_value = s.cat.as_ordered(inplace=True)
623+
assert return_value is None
618624
assert s.cat.ordered
619625

620626
# reorder

pandas/tests/series/test_datetime_values.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,8 @@ def test_dt_accessor_invalid(self, ser):
625625
def test_dt_accessor_updates_on_inplace(self):
626626
s = Series(pd.date_range("2018-01-01", periods=10))
627627
s[2] = None
628-
s.fillna(pd.Timestamp("2018-01-01"), inplace=True)
628+
return_value = s.fillna(pd.Timestamp("2018-01-01"), inplace=True)
629+
assert return_value is None
629630
result = s.dt.date
630631
assert result[0] == result[2]
631632

pandas/tests/series/test_missing.py

+10-5
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,8 @@ def test_fillna_downcast(self):
453453

454454
def test_fillna_int(self):
455455
s = Series(np.random.randint(-100, 100, 50))
456-
s.fillna(method="ffill", inplace=True)
456+
return_value = s.fillna(method="ffill", inplace=True)
457+
assert return_value is None
457458
tm.assert_series_equal(s.fillna(method="ffill", inplace=False), s)
458459

459460
def test_categorical_nan_equality(self):
@@ -680,7 +681,8 @@ def test_dropna_empty(self):
680681
s = Series([], dtype=object)
681682

682683
assert len(s.dropna()) == 0
683-
s.dropna(inplace=True)
684+
return_value = s.dropna(inplace=True)
685+
assert return_value is None
684686
assert len(s) == 0
685687

686688
# invalid axis
@@ -729,7 +731,8 @@ def test_dropna_no_nan(self):
729731
assert result is not s
730732

731733
s2 = s.copy()
732-
s2.dropna(inplace=True)
734+
return_value = s2.dropna(inplace=True)
735+
assert return_value is None
733736
tm.assert_series_equal(s2, s)
734737

735738
def test_dropna_intervals(self):
@@ -775,7 +778,8 @@ def test_pad_nan(self):
775778
[np.nan, 1.0, np.nan, 3.0, np.nan], ["z", "a", "b", "c", "d"], dtype=float
776779
)
777780

778-
x.fillna(method="pad", inplace=True)
781+
return_value = x.fillna(method="pad", inplace=True)
782+
assert return_value is None
779783

780784
expected = Series(
781785
[np.nan, 1.0, 1.0, 3.0, 3.0], ["z", "a", "b", "c", "d"], dtype=float
@@ -799,7 +803,8 @@ def test_dropna_preserve_name(self, datetime_series):
799803
assert result.name == datetime_series.name
800804
name = datetime_series.name
801805
ts = datetime_series.copy()
802-
ts.dropna(inplace=True)
806+
return_value = ts.dropna(inplace=True)
807+
assert return_value is None
803808
assert ts.name == name
804809

805810
def test_series_fillna_limit(self):

0 commit comments

Comments
 (0)