Skip to content

Commit 59221a6

Browse files
committed
wip
1 parent 472c09a commit 59221a6

File tree

2 files changed

+1
-26
lines changed

2 files changed

+1
-26
lines changed

pandas/tests/frame/methods/test_update.py

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -148,22 +148,6 @@ def test_update_datetime_tz_in_place(self):
148148
tm.assert_frame_equal(result, expected)
149149
tm.assert_frame_equal(view, orig)
150150

151-
def test_update_with_different_dtype(self):
152-
# GH#3217
153-
df = DataFrame({"a": [1, 3], "b": [np.nan, 2]})
154-
df["c"] = np.nan
155-
with tm.assert_produces_warning(FutureWarning, match="incompatible dtype"):
156-
df.update({"c": Series(["foo"], index=[0])})
157-
158-
expected = DataFrame(
159-
{
160-
"a": [1, 3],
161-
"b": [np.nan, 2],
162-
"c": Series(["foo", np.nan], dtype="object"),
163-
}
164-
)
165-
tm.assert_frame_equal(df, expected)
166-
167151
def test_update_modify_view(self, using_infer_string):
168152
# GH#47188
169153
df = DataFrame({"A": ["1", np.nan], "B": ["100", np.nan]})

pandas/tests/indexing/multiindex/test_setitem.py

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -212,18 +212,9 @@ def test_multiindex_assignment_single_dtype(self):
212212
result = df.loc[4, "c"]
213213
tm.assert_series_equal(result, exp)
214214

215-
# arr + 0.5 cannot be cast losslessly to int, so we upcast
216-
with tm.assert_produces_warning(
217-
FutureWarning, match="item of incompatible dtype"
218-
):
219-
df.loc[4, "c"] = arr + 0.5
220-
result = df.loc[4, "c"]
221-
exp = exp + 0.5
222-
tm.assert_series_equal(result, exp)
223-
224215
# scalar ok
225216
df.loc[4, "c"] = 10
226-
exp = Series(10, index=[8, 10], name="c", dtype="float64")
217+
exp = Series(10, index=[8, 10], name="c")
227218
tm.assert_series_equal(df.loc[4, "c"], exp)
228219

229220
# invalid assignments

0 commit comments

Comments
 (0)