From 99c6d219242da49a753245dffe8e1765eff24495 Mon Sep 17 00:00:00 2001 From: Brock Date: Thu, 31 Dec 2020 18:57:14 -0800 Subject: [PATCH 1/3] TST: move tests/generic/methods/ to tests/frame/methods/ --- pandas/tests/{generic => frame}/methods/test_dot.py | 0 .../tests/{generic => frame}/methods/test_first_valid_index.py | 0 pandas/tests/{generic => frame}/methods/test_pipe.py | 0 pandas/tests/{generic => frame}/methods/test_reorder_levels.py | 0 pandas/tests/{generic => frame}/methods/test_sample.py | 0 pandas/tests/{generic => frame}/methods/test_set_axis.py | 0 pandas/tests/generic/methods/__init__.py | 3 --- 7 files changed, 3 deletions(-) rename pandas/tests/{generic => frame}/methods/test_dot.py (100%) rename pandas/tests/{generic => frame}/methods/test_first_valid_index.py (100%) rename pandas/tests/{generic => frame}/methods/test_pipe.py (100%) rename pandas/tests/{generic => frame}/methods/test_reorder_levels.py (100%) rename pandas/tests/{generic => frame}/methods/test_sample.py (100%) rename pandas/tests/{generic => frame}/methods/test_set_axis.py (100%) delete mode 100644 pandas/tests/generic/methods/__init__.py diff --git a/pandas/tests/generic/methods/test_dot.py b/pandas/tests/frame/methods/test_dot.py similarity index 100% rename from pandas/tests/generic/methods/test_dot.py rename to pandas/tests/frame/methods/test_dot.py diff --git a/pandas/tests/generic/methods/test_first_valid_index.py b/pandas/tests/frame/methods/test_first_valid_index.py similarity index 100% rename from pandas/tests/generic/methods/test_first_valid_index.py rename to pandas/tests/frame/methods/test_first_valid_index.py diff --git a/pandas/tests/generic/methods/test_pipe.py b/pandas/tests/frame/methods/test_pipe.py similarity index 100% rename from pandas/tests/generic/methods/test_pipe.py rename to pandas/tests/frame/methods/test_pipe.py diff --git a/pandas/tests/generic/methods/test_reorder_levels.py b/pandas/tests/frame/methods/test_reorder_levels.py similarity index 100% rename from pandas/tests/generic/methods/test_reorder_levels.py rename to pandas/tests/frame/methods/test_reorder_levels.py diff --git a/pandas/tests/generic/methods/test_sample.py b/pandas/tests/frame/methods/test_sample.py similarity index 100% rename from pandas/tests/generic/methods/test_sample.py rename to pandas/tests/frame/methods/test_sample.py diff --git a/pandas/tests/generic/methods/test_set_axis.py b/pandas/tests/frame/methods/test_set_axis.py similarity index 100% rename from pandas/tests/generic/methods/test_set_axis.py rename to pandas/tests/frame/methods/test_set_axis.py diff --git a/pandas/tests/generic/methods/__init__.py b/pandas/tests/generic/methods/__init__.py deleted file mode 100644 index 5d18f97b8a55e..0000000000000 --- a/pandas/tests/generic/methods/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -""" -Tests for methods shared by DataFrame and Series. -""" From 6a2c3fdd3531508bb251476b64e8c71de63001e7 Mon Sep 17 00:00:00 2001 From: Brock Date: Thu, 31 Dec 2020 18:58:37 -0800 Subject: [PATCH 2/3] update test_writing.rst --- doc/source/development/test_writing.rst | 7 ------- 1 file changed, 7 deletions(-) diff --git a/doc/source/development/test_writing.rst b/doc/source/development/test_writing.rst index d9e24bb76eed8..76eae505471b7 100644 --- a/doc/source/development/test_writing.rst +++ b/doc/source/development/test_writing.rst @@ -149,13 +149,6 @@ be located. ``frame_or_series`` fixture, by convention it goes in the ``tests.frame`` file. - - tests.generic.methods.test_mymethod - - .. note:: - - The generic/methods/ directory is only for methods with tests - that are fully parametrized over Series/DataFrame - 7. Is your test for an Index method, not depending on Series/DataFrame? This test likely belongs in one of: From fc51234026b71ca45f56c6555932bfb797408fc5 Mon Sep 17 00:00:00 2001 From: Brock Date: Thu, 31 Dec 2020 19:02:27 -0800 Subject: [PATCH 3/3] misplaced to_records test --- pandas/tests/frame/methods/test_to_records.py | 9 +++++++++ pandas/tests/frame/test_constructors.py | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pandas/tests/frame/methods/test_to_records.py b/pandas/tests/frame/methods/test_to_records.py index e83882be9c680..2c96cf291c154 100644 --- a/pandas/tests/frame/methods/test_to_records.py +++ b/pandas/tests/frame/methods/test_to_records.py @@ -15,6 +15,15 @@ class TestDataFrameToRecords: + def test_to_records_timeseries(self): + index = date_range("1/1/2000", periods=10) + df = DataFrame(np.random.randn(10, 3), index=index, columns=["a", "b", "c"]) + + result = df.to_records() + assert result["index"].dtype == "M8[ns]" + + result = df.to_records(index=False) + def test_to_records_dt64(self): df = DataFrame( [["one", "two", "three"], ["four", "five", "six"]], diff --git a/pandas/tests/frame/test_constructors.py b/pandas/tests/frame/test_constructors.py index a16dca256541d..4d57b43df2387 100644 --- a/pandas/tests/frame/test_constructors.py +++ b/pandas/tests/frame/test_constructors.py @@ -2221,15 +2221,6 @@ def test_frame_datetime64_mixed_index_ctor_1681(self): d = DataFrame({"A": "foo", "B": ts}, index=dr) assert d["B"].isna().all() - def test_frame_timeseries_to_records(self): - index = date_range("1/1/2000", periods=10) - df = DataFrame(np.random.randn(10, 3), index=index, columns=["a", "b", "c"]) - - result = df.to_records() - result["index"].dtype == "M8[ns]" - - result = df.to_records(index=False) - def test_frame_timeseries_column(self): # GH19157 dr = date_range(start="20130101T10:00:00", periods=3, freq="T", tz="US/Eastern")