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

Fixturize tests/frame/test_apply #22735

Merged
merged 5 commits into from
Sep 23, 2018
Merged

Fixturize tests/frame/test_apply #22735

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bbc92b2
Fixturize tests/frame/test_apply
h-vetinari Sep 17, 2018
60041e4
Merge branch 'master' into fixturize_frame_apply
h-vetinari Sep 18, 2018
144348b
Merge remote-tracking branch 'origin/master' into fixturize_frame_apply
h-vetinari Sep 19, 2018
3d107c7
Review (WillAyd)
h-vetinari Sep 21, 2018
77bcbce
Review (jreback)
h-vetinari Sep 23, 2018
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
12 changes: 12 additions & 0 deletions pandas/tests/frame/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,18 @@ def int_frame():
return DataFrame({c: s for c, s in compat.iteritems(df)}, dtype=np.int64)


@pytest.fixture
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so don't add this here, rather make it a fixture in test_apply.py; this conftest is for pretty common fixtures, this is not one of them (of course if could decide later to change this)

def int_frame_const_col():
"""
Fixture for DataFrame of ints which are constant per column

Columns are ['A', 'B', 'C'], with values (per column): [1, 2, 3]
"""
df = DataFrame(np.tile(np.arange(3, dtype='int64'), 6).reshape(6, -1) + 1,
columns=['A', 'B', 'C'])
return df


@pytest.fixture
def datetime_frame():
"""
Expand Down
Loading