Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TST: remove never-used singleton fixtures #24885

Merged
merged 4 commits into from
Feb 24, 2019
Merged

TST: remove never-used singleton fixtures #24885

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
03bd15f
remove never-used fixtures
jbrockmendel Jan 23, 2019
2946c5d
remove never-used fixtures
jbrockmendel Jan 23, 2019
c1aa391
Merge branch 'master' of https://github.com/pandas-dev/pandas into si…
jbrockmendel Feb 18, 2019
2bbeae8
Merge branch 'master' of https://github.com/pandas-dev/pandas into si…
jbrockmendel Feb 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 0 additions & 54 deletions pandas/tests/frame/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,6 @@ def float_frame_with_na():
return df


@pytest.fixture
def float_frame2():
"""
Fixture for DataFrame of floats with index of unique strings

Columns are ['D', 'C', 'B', 'A']
"""
return DataFrame(tm.getSeriesData(), columns=['D', 'C', 'B', 'A'])


@pytest.fixture
def bool_frame_with_na():
"""
Expand Down Expand Up @@ -104,21 +94,6 @@ def mixed_float_frame():
return df


@pytest.fixture
def mixed_float_frame2():
"""
Fixture for DataFrame of different float types with index of unique strings

Columns are ['A', 'B', 'C', 'D'].
"""
df = DataFrame(tm.getSeriesData())
df.D = df.D.astype('float32')
df.C = df.C.astype('float32')
df.B = df.B.astype('float16')
df.D = df.D.astype('float64')
return df


@pytest.fixture
def mixed_int_frame():
"""
Expand All @@ -135,19 +110,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., 'b': 2, 'c': 'foo',
'float32': np.array([1.] * 10, dtype='float32'),
'int32': np.array([1] * 10, dtype='int32')},
index=np.arange(10))


@pytest.fixture
def timezone_frame():
"""
Expand All @@ -173,22 +135,6 @@ def empty_frame():
return DataFrame({})


@pytest.fixture
def datetime_series():
"""
Fixture for Series of floats with DatetimeIndex
"""
return tm.makeTimeSeries(nper=30)


@pytest.fixture
def datetime_series_short():
"""
Fixture for Series of floats with DatetimeIndex
"""
return tm.makeTimeSeries(nper=30)[5:]


@pytest.fixture
def simple_frame():
"""
Expand Down