Skip to content

Commit b7184b9

Browse files
authored
REF/TST: Move Series/DataFrame apply tests to tests.apply (#39312)
1 parent c3012b1 commit b7184b9

10 files changed

+18
-18
lines changed

pandas/conftest.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -711,6 +711,24 @@ def float_frame():
711711
return DataFrame(tm.getSeriesData())
712712

713713

714+
@pytest.fixture
715+
def mixed_type_frame():
716+
"""
717+
Fixture for DataFrame of float/int/string columns with RangeIndex
718+
Columns are ['a', 'b', 'c', 'float32', 'int32'].
719+
"""
720+
return DataFrame(
721+
{
722+
"a": 1.0,
723+
"b": 2,
724+
"c": "foo",
725+
"float32": np.array([1.0] * 10, dtype="float32"),
726+
"int32": np.array([1] * 10, dtype="int32"),
727+
},
728+
index=np.arange(10),
729+
)
730+
731+
714732
# ----------------------------------------------------------------
715733
# Scalars
716734
# ----------------------------------------------------------------
File renamed without changes.

pandas/tests/frame/conftest.py

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -183,24 +183,6 @@ def mixed_int_frame():
183183
return df
184184

185185

186-
@pytest.fixture
187-
def mixed_type_frame():
188-
"""
189-
Fixture for DataFrame of float/int/string columns with RangeIndex
190-
Columns are ['a', 'b', 'c', 'float32', 'int32'].
191-
"""
192-
return DataFrame(
193-
{
194-
"a": 1.0,
195-
"b": 2,
196-
"c": "foo",
197-
"float32": np.array([1.0] * 10, dtype="float32"),
198-
"int32": np.array([1] * 10, dtype="int32"),
199-
},
200-
index=np.arange(10),
201-
)
202-
203-
204186
@pytest.fixture
205187
def timezone_frame():
206188
"""

pandas/tests/series/apply/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)