diff --git a/pandas/conftest.py b/pandas/conftest.py index 45d545a522fc7..0b1c09b56a985 100644 --- a/pandas/conftest.py +++ b/pandas/conftest.py @@ -711,6 +711,24 @@ def float_frame(): return DataFrame(tm.getSeriesData()) +@pytest.fixture +def mixed_type_frame(): + """ + Fixture for DataFrame of float/int/string columns with RangeIndex + Columns are ['a', 'b', 'c', 'float32', 'int32']. + """ + return DataFrame( + { + "a": 1.0, + "b": 2, + "c": "foo", + "float32": np.array([1.0] * 10, dtype="float32"), + "int32": np.array([1] * 10, dtype="int32"), + }, + index=np.arange(10), + ) + + # ---------------------------------------------------------------- # Scalars # ---------------------------------------------------------------- diff --git a/pandas/tests/frame/apply/__init__.py b/pandas/tests/apply/__init__.py similarity index 100% rename from pandas/tests/frame/apply/__init__.py rename to pandas/tests/apply/__init__.py diff --git a/pandas/tests/frame/apply/test_frame_apply.py b/pandas/tests/apply/test_frame_apply.py similarity index 100% rename from pandas/tests/frame/apply/test_frame_apply.py rename to pandas/tests/apply/test_frame_apply.py diff --git a/pandas/tests/frame/apply/test_apply_relabeling.py b/pandas/tests/apply/test_frame_apply_relabeling.py similarity index 100% rename from pandas/tests/frame/apply/test_apply_relabeling.py rename to pandas/tests/apply/test_frame_apply_relabeling.py diff --git a/pandas/tests/frame/apply/test_frame_transform.py b/pandas/tests/apply/test_frame_transform.py similarity index 100% rename from pandas/tests/frame/apply/test_frame_transform.py rename to pandas/tests/apply/test_frame_transform.py diff --git a/pandas/tests/series/apply/test_series_apply.py b/pandas/tests/apply/test_series_apply.py similarity index 100% rename from pandas/tests/series/apply/test_series_apply.py rename to pandas/tests/apply/test_series_apply.py diff --git a/pandas/tests/series/apply/test_apply_relabeling.py b/pandas/tests/apply/test_series_apply_relabeling.py similarity index 100% rename from pandas/tests/series/apply/test_apply_relabeling.py rename to pandas/tests/apply/test_series_apply_relabeling.py diff --git a/pandas/tests/series/apply/test_series_transform.py b/pandas/tests/apply/test_series_transform.py similarity index 100% rename from pandas/tests/series/apply/test_series_transform.py rename to pandas/tests/apply/test_series_transform.py diff --git a/pandas/tests/frame/conftest.py b/pandas/tests/frame/conftest.py index 05ceb2ded71d0..c6c8515d3b89b 100644 --- a/pandas/tests/frame/conftest.py +++ b/pandas/tests/frame/conftest.py @@ -183,24 +183,6 @@ def mixed_int_frame(): return df -@pytest.fixture -def mixed_type_frame(): - """ - Fixture for DataFrame of float/int/string columns with RangeIndex - Columns are ['a', 'b', 'c', 'float32', 'int32']. - """ - return DataFrame( - { - "a": 1.0, - "b": 2, - "c": "foo", - "float32": np.array([1.0] * 10, dtype="float32"), - "int32": np.array([1] * 10, dtype="int32"), - }, - index=np.arange(10), - ) - - @pytest.fixture def timezone_frame(): """ diff --git a/pandas/tests/series/apply/__init__.py b/pandas/tests/series/apply/__init__.py deleted file mode 100644 index e69de29bb2d1d..0000000000000