Skip to content

CLN: res/exp and GH references in frame tests #22730

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

Merged
merged 14 commits into from
Oct 8, 2018
Merged

CLN: res/exp and GH references in frame tests #22730

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f699cd2
Fixturize tests/frame/test_arithmetic
h-vetinari Sep 17, 2018
e903579
Fixturize tests/frame/test_analytics
h-vetinari Sep 23, 2018
be4605d
Clean res/exp in frame/test_apply.py
h-vetinari Sep 23, 2018
a399489
Unify GH references in frame/test_apply.py
h-vetinari Sep 23, 2018
b403a73
Clean up res/exp in frame/test_api.py
h-vetinari Sep 23, 2018
fa0fc2f
Unify GH references in frame/test_api.py
h-vetinari Sep 23, 2018
f56bfde
Clean res/exp in frame/test_arithmetic.py
h-vetinari Sep 23, 2018
f29a839
Unify GH references for frame/test_arithmetic.py
h-vetinari Sep 23, 2018
780dd84
Clean res/exp for frame/test_analytics.py
h-vetinari Sep 23, 2018
0e70a30
Unify GH reference for frame/test_analytics.py
h-vetinari Sep 23, 2018
855a186
Change GH reference formatting (review jreback)
h-vetinari Sep 23, 2018
733b889
Revert "Change GH reference formatting (review jreback)"
h-vetinari Sep 23, 2018
d0c6d37
Merge remote-tracking branch 'upstream/master' into fixturize_frame_t…
h-vetinari Oct 7, 2018
ca36942
Fix typo
h-vetinari Oct 7, 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
47 changes: 39 additions & 8 deletions pandas/tests/frame/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,20 @@ def float_frame():
return DataFrame(tm.getSeriesData())


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

Columns are ['A', 'B', 'C', 'D']; some entries are missing
"""
df = DataFrame(tm.getSeriesData())
# set some NAs
df.loc[5:10] = np.nan
df.loc[15:20, -2:] = np.nan
return df


@pytest.fixture
def float_frame2():
"""
Expand All @@ -27,6 +41,21 @@ def float_frame2():
return DataFrame(tm.getSeriesData(), columns=['D', 'C', 'B', 'A'])


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

Columns are ['A', 'B', 'C', 'D']; some entries are missing
"""
df = DataFrame(tm.getSeriesData()) > 0
df = df.astype(object)
# set some NAs
df.loc[5:10] = np.nan
df.loc[15:20, -2:] = np.nan
return df


@pytest.fixture
def int_frame():
"""
Expand Down Expand Up @@ -70,9 +99,10 @@ def mixed_float_frame():
Columns are ['A', 'B', 'C', 'D'].
"""
df = DataFrame(tm.getSeriesData())
df.A = df.A.astype('float16')
df.A = df.A.astype('float32')
Copy link
Member

Choose a reason for hiding this comment

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

What's the reasoning for changing these?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

See OP:

In translating the quasi-fixtures from TestData to conftest in #22236, I sorted the dtypes for the columns of mixed_float_frame and mixed_int_frame, which turns out to have been a mistake. This is reverted here to be a true translation of the attribute of TestData. Otherwise, tests in the newly fixturized test_arithmetic.py would fail.

df.B = df.B.astype('float32')
df.C = df.C.astype('float64')
df.C = df.C.astype('float16')
df.D = df.D.astype('float64')
return df


Expand All @@ -84,9 +114,10 @@ def mixed_float_frame2():
Columns are ['A', 'B', 'C', 'D'].
"""
df = DataFrame(tm.getSeriesData())
df.D = df.D.astype('float16')
df.D = df.D.astype('float32')
df.C = df.C.astype('float32')
df.B = df.B.astype('float64')
df.B = df.B.astype('float16')
df.D = df.D.astype('float64')
return df


Expand All @@ -99,10 +130,10 @@ def mixed_int_frame():
"""
df = DataFrame({k: v.astype(int)
for k, v in compat.iteritems(tm.getSeriesData())})
df.A = df.A.astype('uint8')
df.B = df.B.astype('int32')
df.C = df.C.astype('int64')
df.D = np.ones(len(df.D), dtype='uint64')
df.A = df.A.astype('int32')
df.B = np.ones(len(df.B), dtype='uint64')
df.C = df.C.astype('uint8')
df.D = df.C.astype('int64')
return df


Expand Down
Loading