wip

Author: MarcoGorelli

pandas/tests/frame/indexing/test_where.py

@@ -520,6 +520,7 @@ def test_where_axis_with_upcast(self):
         result = df.where(mask, ser, axis="columns")
         tm.assert_frame_equal(result, expected)
 
+        result = df.copy()
         with pytest.raises(TypeError, match="Invalid value"):
             result.where(mask, ser, axis="columns", inplace=True)
 
@@ -573,15 +574,10 @@ def test_where_axis_multiple_dtypes(self):
         result = df.where(mask, d1, axis="index")
         tm.assert_frame_equal(result, expected)
         result = df.copy()
-        with tm.assert_produces_warning(FutureWarning, match="incompatible dtype"):
-            return_value = result.where(mask, d1, inplace=True)
-        assert return_value is None
-        tm.assert_frame_equal(result, expected)
-        result = df.copy()
-        with tm.assert_produces_warning(FutureWarning, match="incompatible dtype"):
+        with pytest.raises(TypeError, match="Invalid value"):
+            result.where(mask, d1, inplace=True)
+        with pytest.raises(TypeError, match="Invalid value"):
             return_value = result.where(mask, d1, inplace=True, axis="index")
-        assert return_value is None
-        tm.assert_frame_equal(result, expected)
 
         d2 = df.copy().drop(1, axis=1)
         expected = df.copy()
@@ -728,11 +724,8 @@ def test_where_interval_fullop_downcast(self, frame_or_series):
         res = obj.where(~obj.notna(), other)
         tm.assert_equal(res, other)
 
-        with tm.assert_produces_warning(
-            FutureWarning, match="Setting an item of incompatible dtype"
-        ):
+        with pytest.raises(TypeError, match="Invalid value"):
             obj.mask(obj.notna(), other, inplace=True)
-        tm.assert_equal(obj, other.astype(object))
 
     @pytest.mark.parametrize(
         "dtype",
@@ -762,14 +755,10 @@ def test_where_datetimelike_noop(self, dtype):
 
         res4 = df.mask(mask2, "foo")
         tm.assert_frame_equal(res4, df)
-        expected = DataFrame(4, index=df.index, columns=df.columns)
 
         # unlike where, Block.putmask does not downcast
-        with tm.assert_produces_warning(
-            FutureWarning, match="Setting an item of incompatible dtype"
-        ):
+        with pytest.raises(TypeError, match="Invalid value"):
             df.mask(~mask2, 4, inplace=True)
-        tm.assert_frame_equal(df, expected.astype(object))
 
 
 def test_where_int_downcasting_deprecated():
@@ -923,11 +912,8 @@ def test_where_period_invalid_na(frame_or_series, as_cat, request):
         result = obj.mask(mask, tdnat)
         tm.assert_equal(result, expected)
 
-        with tm.assert_produces_warning(
-            FutureWarning, match="Setting an item of incompatible dtype"
-        ):
+        with pytest.raises(TypeError, match="Invalid value"):
             obj.mask(mask, tdnat, inplace=True)
-        tm.assert_equal(obj, expected)
 
 
 def test_where_nullable_invalid_na(frame_or_series, any_numeric_ea_dtype):
@@ -1009,9 +995,7 @@ def test_where_dt64_2d():
             "B": dta[:, 1],
         }
     )
-    with tm.assert_produces_warning(
-        FutureWarning, match="Setting an item of incompatible dtype"
-    ):
+    with pytest.raises(TypeError, match="Invalid value"):
         _check_where_equivalences(df, mask, other, expected)
 
     # setting nothing in either column