REF/TST: Move Series/DataFrame apply tests to tests.apply (#39312)

pandas-dev · Jan 21, 2021 · b7184b9 · b7184b9
1 parent c3012b1
commit b7184b9
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 18 deletions.
diff --git 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 → pandas/tests/apply/__init__.py b/pandas/tests/frame/apply/__init__.py → pandas/tests/apply/__init__.py
diff --git a/pandas/tests/frame/apply/test_frame_apply.py → pandas/tests/apply/test_frame_apply.py b/pandas/tests/frame/apply/test_frame_apply.py → pandas/tests/apply/test_frame_apply.py
diff --git a/...ests/frame/apply/test_apply_relabeling.py → ...ests/apply/test_frame_apply_relabeling.py b/...ests/frame/apply/test_apply_relabeling.py → ...ests/apply/test_frame_apply_relabeling.py
diff --git a/...tests/frame/apply/test_frame_transform.py → pandas/tests/apply/test_frame_transform.py b/...tests/frame/apply/test_frame_transform.py → pandas/tests/apply/test_frame_transform.py
diff --git a/...s/tests/series/apply/test_series_apply.py → pandas/tests/apply/test_series_apply.py b/...s/tests/series/apply/test_series_apply.py → pandas/tests/apply/test_series_apply.py
diff --git a/...sts/series/apply/test_apply_relabeling.py → ...sts/apply/test_series_apply_relabeling.py b/...sts/series/apply/test_apply_relabeling.py → ...sts/apply/test_series_apply_relabeling.py
diff --git a/...sts/series/apply/test_series_transform.py → pandas/tests/apply/test_series_transform.py b/...sts/series/apply/test_series_transform.py → pandas/tests/apply/test_series_transform.py
diff --git 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