diff --git a/pandas/tests/frame/methods/test_drop.py b/pandas/tests/frame/methods/test_drop.py index aa44a2427dc8f..da369658078a0 100644 --- a/pandas/tests/frame/methods/test_drop.py +++ b/pandas/tests/frame/methods/test_drop.py @@ -420,3 +420,24 @@ def test_drop_preserve_names(self): result = df.drop([(0, 2)]) assert result.index.names == ("one", "two") + + @pytest.mark.parametrize( + "operation", ["__iadd__", "__isub__", "__imul__", "__ipow__"] + ) + @pytest.mark.parametrize("inplace", [False, True]) + def test_inplace_drop_and_operation(self, operation, inplace): + # GH#30484 + df = pd.DataFrame({"x": range(5)}) + expected = df.copy() + df["y"] = range(5) + y = df["y"] + + with tm.assert_produces_warning(None): + if inplace: + df.drop("y", axis=1, inplace=inplace) + else: + df = df.drop("y", axis=1, inplace=inplace) + + # Perform operation and check result + getattr(y, operation)(1) + tm.assert_frame_equal(df, expected) diff --git a/pandas/tests/frame/test_axis_select_reindex.py b/pandas/tests/frame/test_axis_select_reindex.py index b68e20bee63fc..12945533b17ae 100644 --- a/pandas/tests/frame/test_axis_select_reindex.py +++ b/pandas/tests/frame/test_axis_select_reindex.py @@ -488,24 +488,3 @@ def test_reindex_multi_categorical_time(self): result = df2.reindex(midx) expected = pd.DataFrame({"a": [0, 1, 2, 3, 4, 5, 6, np.nan, 8]}, index=midx) tm.assert_frame_equal(result, expected) - - @pytest.mark.parametrize( - "operation", ["__iadd__", "__isub__", "__imul__", "__ipow__"] - ) - @pytest.mark.parametrize("inplace", [False, True]) - def test_inplace_drop_and_operation(self, operation, inplace): - # GH 30484 - df = pd.DataFrame({"x": range(5)}) - expected = df.copy() - df["y"] = range(5) - y = df["y"] - - with tm.assert_produces_warning(None): - if inplace: - df.drop("y", axis=1, inplace=inplace) - else: - df = df.drop("y", axis=1, inplace=inplace) - - # Perform operation and check result - getattr(y, operation)(1) - tm.assert_frame_equal(df, expected) diff --git a/pandas/tests/frame/test_constructors.py b/pandas/tests/frame/test_constructors.py index 8ec11d14cd606..c6708a7b7f6c9 100644 --- a/pandas/tests/frame/test_constructors.py +++ b/pandas/tests/frame/test_constructors.py @@ -2677,6 +2677,13 @@ def test_with_mismatched_index_length_raises(self): with pytest.raises(ValueError, match="Shape of passed values"): DataFrame(dti, index=range(4)) + def test_frame_ctor_datetime64_column(self): + rng = date_range("1/1/2000 00:00:00", "1/1/2000 1:59:50", freq="10s") + dates = np.asarray(rng) + + df = DataFrame({"A": np.random.randn(len(rng)), "B": dates}) + assert np.issubdtype(df["B"].dtype, np.dtype("M8[ns]")) + class TestDataFrameConstructorWithDatetimeTZ: def test_from_dict(self): diff --git a/pandas/tests/frame/test_operators.py b/pandas/tests/frame/test_logical_ops.py similarity index 100% rename from pandas/tests/frame/test_operators.py rename to pandas/tests/frame/test_logical_ops.py diff --git a/pandas/tests/frame/test_timeseries.py b/pandas/tests/frame/test_timeseries.py index 63361789b8e50..e4e22953397ca 100644 --- a/pandas/tests/frame/test_timeseries.py +++ b/pandas/tests/frame/test_timeseries.py @@ -1,18 +1,11 @@ import numpy as np import pandas as pd -from pandas import DataFrame, date_range, to_datetime +from pandas import DataFrame, to_datetime import pandas._testing as tm class TestDataFrameTimeSeriesMethods: - def test_frame_ctor_datetime64_column(self): - rng = date_range("1/1/2000 00:00:00", "1/1/2000 1:59:50", freq="10s") - dates = np.asarray(rng) - - df = DataFrame({"A": np.random.randn(len(rng)), "B": dates}) - assert np.issubdtype(df["B"].dtype, np.dtype("M8[ns]")) - def test_frame_append_datetime64_col_other_units(self): n = 100 diff --git a/pandas/tests/series/test_operators.py b/pandas/tests/series/test_logical_ops.py similarity index 100% rename from pandas/tests/series/test_operators.py rename to pandas/tests/series/test_logical_ops.py