Skip to content

Commit 963d151

Browse files
Add explicit test for warning, ignore in the remainder of the tests
1 parent 7d96d25 commit 963d151

File tree

2 files changed

+81
-124
lines changed

2 files changed

+81
-124
lines changed

pandas/tests/frame/methods/test_append.py

Lines changed: 46 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import pandas._testing as tm
1313

1414

15+
@pytest.mark.filterwarnings("ignore:.*append method is deprecated.*:FutureWarning")
1516
class TestDataFrameAppend:
1617
def test_append_multiindex(self, multiindex_dataframe_random_data, frame_or_series):
1718
obj = multiindex_dataframe_random_data
@@ -21,22 +22,19 @@ def test_append_multiindex(self, multiindex_dataframe_random_data, frame_or_seri
2122
a = obj[:5]
2223
b = obj[5:]
2324

24-
with tm.assert_produces_warning(FutureWarning):
25-
result = a.append(b)
25+
result = a.append(b)
2626
tm.assert_equal(result, obj)
2727

2828
def test_append_empty_list(self):
2929
# GH 28769
3030
df = DataFrame()
31-
with tm.assert_produces_warning(FutureWarning):
32-
result = df.append([])
31+
result = df.append([])
3332
expected = df
3433
tm.assert_frame_equal(result, expected)
3534
assert result is not df
3635

3736
df = DataFrame(np.random.randn(5, 4), columns=["foo", "bar", "baz", "qux"])
38-
with tm.assert_produces_warning(FutureWarning):
39-
result = df.append([])
37+
result = df.append([])
4038
expected = df
4139
tm.assert_frame_equal(result, expected)
4240
assert result is not df # .append() should return a new object
@@ -46,69 +44,57 @@ def test_append_series_dict(self):
4644

4745
series = df.loc[4]
4846
msg = "Indexes have overlapping values"
49-
with pytest.raises(ValueError, match=msg), tm.assert_produces_warning(
50-
FutureWarning
51-
):
47+
with pytest.raises(ValueError, match=msg):
5248
df.append(series, verify_integrity=True)
5349

5450
series.name = None
5551
msg = "Can only append a Series if ignore_index=True"
56-
with pytest.raises(TypeError, match=msg), tm.assert_produces_warning(
57-
FutureWarning
58-
):
52+
with pytest.raises(TypeError, match=msg):
5953
df.append(series, verify_integrity=True)
6054

61-
with tm.assert_produces_warning(FutureWarning):
62-
result = df.append(series[::-1], ignore_index=True)
63-
expected = df.append(
64-
DataFrame({0: series[::-1]}, index=df.columns).T, ignore_index=True
65-
)
55+
result = df.append(series[::-1], ignore_index=True)
56+
expected = df.append(
57+
DataFrame({0: series[::-1]}, index=df.columns).T, ignore_index=True
58+
)
6659
tm.assert_frame_equal(result, expected)
6760

6861
# dict
69-
with tm.assert_produces_warning(FutureWarning):
70-
result = df.append(series.to_dict(), ignore_index=True)
62+
result = df.append(series.to_dict(), ignore_index=True)
7163
tm.assert_frame_equal(result, expected)
7264

73-
with tm.assert_produces_warning(FutureWarning):
74-
result = df.append(series[::-1][:3], ignore_index=True)
75-
expected = df.append(
76-
DataFrame({0: series[::-1][:3]}).T, ignore_index=True, sort=True
77-
)
65+
result = df.append(series[::-1][:3], ignore_index=True)
66+
expected = df.append(
67+
DataFrame({0: series[::-1][:3]}).T, ignore_index=True, sort=True
68+
)
7869
tm.assert_frame_equal(result, expected.loc[:, result.columns])
7970

8071
msg = "Can only append a dict if ignore_index=True"
81-
with pytest.raises(TypeError, match=msg), tm.assert_produces_warning(
82-
FutureWarning
83-
):
72+
with pytest.raises(TypeError, match=msg):
8473
df.append(series.to_dict())
8574

8675
# can append when name set
8776
row = df.loc[4]
8877
row.name = 5
89-
with tm.assert_produces_warning(FutureWarning):
90-
result = df.append(row)
91-
expected = df.append(df[-1:], ignore_index=True)
78+
result = df.append(row)
79+
expected = df.append(df[-1:], ignore_index=True)
9280
tm.assert_frame_equal(result, expected)
9381

9482
def test_append_list_of_series_dicts(self):
9583
df = DataFrame(np.random.randn(5, 4), columns=["foo", "bar", "baz", "qux"])
9684

9785
dicts = [x.to_dict() for idx, x in df.iterrows()]
9886

99-
with tm.assert_produces_warning(FutureWarning):
100-
result = df.append(dicts, ignore_index=True)
101-
expected = df.append(df, ignore_index=True)
87+
result = df.append(dicts, ignore_index=True)
88+
expected = df.append(df, ignore_index=True)
10289
tm.assert_frame_equal(result, expected)
10390

10491
# different columns
10592
dicts = [
10693
{"foo": 1, "bar": 2, "baz": 3, "peekaboo": 4},
10794
{"foo": 5, "bar": 6, "baz": 7, "peekaboo": 8},
10895
]
109-
with tm.assert_produces_warning(FutureWarning):
110-
result = df.append(dicts, ignore_index=True, sort=True)
111-
expected = df.append(DataFrame(dicts), ignore_index=True, sort=True)
96+
result = df.append(dicts, ignore_index=True, sort=True)
97+
expected = df.append(DataFrame(dicts), ignore_index=True, sort=True)
11298
tm.assert_frame_equal(result, expected)
11399

114100
def test_append_list_retain_index_name(self):
@@ -124,13 +110,11 @@ def test_append_list_retain_index_name(self):
124110
)
125111

126112
# append series
127-
with tm.assert_produces_warning(FutureWarning):
128-
result = df.append(serc)
113+
result = df.append(serc)
129114
tm.assert_frame_equal(result, expected)
130115

131116
# append list of series
132-
with tm.assert_produces_warning(FutureWarning):
133-
result = df.append([serc])
117+
result = df.append([serc])
134118
tm.assert_frame_equal(result, expected)
135119

136120
def test_append_missing_cols(self):
@@ -141,43 +125,38 @@ def test_append_missing_cols(self):
141125
df = DataFrame(np.random.randn(5, 4), columns=["foo", "bar", "baz", "qux"])
142126

143127
dicts = [{"foo": 9}, {"bar": 10}]
144-
with tm.assert_produces_warning(FutureWarning):
145-
result = df.append(dicts, ignore_index=True, sort=True)
128+
result = df.append(dicts, ignore_index=True, sort=True)
146129

147-
expected = df.append(DataFrame(dicts), ignore_index=True, sort=True)
130+
expected = df.append(DataFrame(dicts), ignore_index=True, sort=True)
148131
tm.assert_frame_equal(result, expected)
149132

150133
def test_append_empty_dataframe(self):
151134

152135
# Empty df append empty df
153136
df1 = DataFrame()
154137
df2 = DataFrame()
155-
with tm.assert_produces_warning(FutureWarning):
156-
result = df1.append(df2)
138+
result = df1.append(df2)
157139
expected = df1.copy()
158140
tm.assert_frame_equal(result, expected)
159141

160142
# Non-empty df append empty df
161143
df1 = DataFrame(np.random.randn(5, 2))
162144
df2 = DataFrame()
163-
with tm.assert_produces_warning(FutureWarning):
164-
result = df1.append(df2)
145+
result = df1.append(df2)
165146
expected = df1.copy()
166147
tm.assert_frame_equal(result, expected)
167148

168149
# Empty df with columns append empty df
169150
df1 = DataFrame(columns=["bar", "foo"])
170151
df2 = DataFrame()
171-
with tm.assert_produces_warning(FutureWarning):
172-
result = df1.append(df2)
152+
result = df1.append(df2)
173153
expected = df1.copy()
174154
tm.assert_frame_equal(result, expected)
175155

176156
# Non-Empty df with columns append empty df
177157
df1 = DataFrame(np.random.randn(5, 2), columns=["bar", "foo"])
178158
df2 = DataFrame()
179-
with tm.assert_produces_warning(FutureWarning):
180-
result = df1.append(df2)
159+
result = df1.append(df2)
181160
expected = df1.copy()
182161
tm.assert_frame_equal(result, expected)
183162

@@ -189,22 +168,19 @@ def test_append_dtypes(self):
189168

190169
df1 = DataFrame({"bar": Timestamp("20130101")}, index=range(5))
191170
df2 = DataFrame()
192-
with tm.assert_produces_warning(FutureWarning):
193-
result = df1.append(df2)
171+
result = df1.append(df2)
194172
expected = df1.copy()
195173
tm.assert_frame_equal(result, expected)
196174

197175
df1 = DataFrame({"bar": Timestamp("20130101")}, index=range(1))
198176
df2 = DataFrame({"bar": "foo"}, index=range(1, 2))
199-
with tm.assert_produces_warning(FutureWarning):
200-
result = df1.append(df2)
177+
result = df1.append(df2)
201178
expected = DataFrame({"bar": [Timestamp("20130101"), "foo"]})
202179
tm.assert_frame_equal(result, expected)
203180

204181
df1 = DataFrame({"bar": Timestamp("20130101")}, index=range(1))
205182
df2 = DataFrame({"bar": np.nan}, index=range(1, 2))
206-
with tm.assert_produces_warning(FutureWarning):
207-
result = df1.append(df2)
183+
result = df1.append(df2)
208184
expected = DataFrame(
209185
{"bar": Series([Timestamp("20130101"), np.nan], dtype="M8[ns]")}
210186
)
@@ -213,8 +189,7 @@ def test_append_dtypes(self):
213189

214190
df1 = DataFrame({"bar": Timestamp("20130101")}, index=range(1))
215191
df2 = DataFrame({"bar": np.nan}, index=range(1, 2), dtype=object)
216-
with tm.assert_produces_warning(FutureWarning):
217-
result = df1.append(df2)
192+
result = df1.append(df2)
218193
expected = DataFrame(
219194
{"bar": Series([Timestamp("20130101"), np.nan], dtype="M8[ns]")}
220195
)
@@ -223,8 +198,7 @@ def test_append_dtypes(self):
223198

224199
df1 = DataFrame({"bar": np.nan}, index=range(1))
225200
df2 = DataFrame({"bar": Timestamp("20130101")}, index=range(1, 2))
226-
with tm.assert_produces_warning(FutureWarning):
227-
result = df1.append(df2)
201+
result = df1.append(df2)
228202
expected = DataFrame(
229203
{"bar": Series([np.nan, Timestamp("20130101")], dtype="M8[ns]")}
230204
)
@@ -233,8 +207,7 @@ def test_append_dtypes(self):
233207

234208
df1 = DataFrame({"bar": Timestamp("20130101")}, index=range(1))
235209
df2 = DataFrame({"bar": 1}, index=range(1, 2), dtype=object)
236-
with tm.assert_produces_warning(FutureWarning):
237-
result = df1.append(df2)
210+
result = df1.append(df2)
238211
expected = DataFrame({"bar": Series([Timestamp("20130101"), 1])})
239212
tm.assert_frame_equal(result, expected)
240213

@@ -245,8 +218,7 @@ def test_append_timestamps_aware_or_naive(self, tz_naive_fixture, timestamp):
245218
# GH 30238
246219
tz = tz_naive_fixture
247220
df = DataFrame([Timestamp(timestamp, tz=tz)])
248-
with tm.assert_produces_warning(FutureWarning):
249-
result = df.append(df.iloc[0]).iloc[-1]
221+
result = df.append(df.iloc[0]).iloc[-1]
250222
expected = Series(Timestamp(timestamp, tz=tz), name=0)
251223
tm.assert_series_equal(result, expected)
252224

@@ -262,8 +234,7 @@ def test_append_timestamps_aware_or_naive(self, tz_naive_fixture, timestamp):
262234
)
263235
def test_other_dtypes(self, data, dtype):
264236
df = DataFrame(data, dtype=dtype)
265-
with tm.assert_produces_warning(FutureWarning):
266-
result = df.append(df.iloc[0]).iloc[-1]
237+
result = df.append(df.iloc[0]).iloc[-1]
267238
expected = Series(data, name=0, dtype=dtype)
268239
tm.assert_series_equal(result, expected)
269240

@@ -278,8 +249,7 @@ def test_append_numpy_bug_1681(self, dtype):
278249
df = DataFrame()
279250
other = DataFrame({"A": "foo", "B": index}, index=index)
280251

281-
with tm.assert_produces_warning(FutureWarning):
282-
result = df.append(other)
252+
result = df.append(other)
283253
assert (result["B"] == index).all()
284254

285255
@pytest.mark.filterwarnings("ignore:The values in the array:RuntimeWarning")
@@ -294,10 +264,15 @@ def test_multiindex_column_append_multiple(self):
294264
df2 = df.copy()
295265
for i in range(1, 10):
296266
df[i, "colA"] = 10
297-
with tm.assert_produces_warning(FutureWarning):
298-
df = df.append(df2, ignore_index=True)
267+
df = df.append(df2, ignore_index=True)
299268
result = df["multi"]
300269
expected = DataFrame(
301270
{"col1": [1, 2, 3] * (i + 1), "col2": [11, 12, 13] * (i + 1)}
302271
)
303272
tm.assert_frame_equal(result, expected)
273+
274+
def test_append_raises_future_warning(self):
275+
df1 = DataFrame([[1, 2], [3, 4]])
276+
df2 = DataFrame([[5, 6], [7, 8]])
277+
with tm.assert_produces_warning(FutureWarning):
278+
df1.append(df2)

0 commit comments

Comments
 (0)