Skip to content

TST: revert parts of #32571 #32630

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 1 commit into from
Mar 11, 2020
Merged

TST: revert parts of #32571 #32630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 26 additions & 5 deletions pandas/tests/frame/test_analytics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ def assert_stat_op_calc(
has_skipna=True,
check_dtype=True,
check_dates=False,
check_less_precise=False,
skipna_alternative=None,
):
"""
Expand All @@ -53,6 +54,9 @@ def assert_stat_op_calc(
"alternative(frame)" should be checked.
check_dates : bool, default false
Whether opname should be tested on a Datetime Series
check_less_precise : bool, default False
Whether results should only be compared approximately;
passed on to tm.assert_series_equal
skipna_alternative : function, default None
NaN-safe version of alternative
"""
Expand Down Expand Up @@ -80,24 +84,35 @@ def wrapper(x):
result0 = f(axis=0, skipna=False)
result1 = f(axis=1, skipna=False)
tm.assert_series_equal(
result0, frame.apply(wrapper), check_dtype=check_dtype,
result0,
frame.apply(wrapper),
check_dtype=check_dtype,
check_less_precise=check_less_precise,
)
# HACK: win32
tm.assert_series_equal(
result1, frame.apply(wrapper, axis=1), check_dtype=False,
result1,
frame.apply(wrapper, axis=1),
check_dtype=False,
check_less_precise=check_less_precise,
)
else:
skipna_wrapper = alternative

result0 = f(axis=0)
result1 = f(axis=1)
tm.assert_series_equal(
result0, frame.apply(skipna_wrapper), check_dtype=check_dtype,
result0,
frame.apply(skipna_wrapper),
check_dtype=check_dtype,
check_less_precise=check_less_precise,
)

if opname in ["sum", "prod"]:
expected = frame.apply(skipna_wrapper, axis=1)
tm.assert_series_equal(result1, expected, check_dtype=False)
tm.assert_series_equal(
result1, expected, check_dtype=False, check_less_precise=check_less_precise
)

# check dtypes
if check_dtype:
Expand Down Expand Up @@ -316,9 +331,15 @@ def kurt(x):
check_dates=True,
)

# GH#32571 check_less_precise is needed on apparently-random
# py37-npdev builds and OSX-PY36-min_version builds
# mixed types (with upcasting happening)
assert_stat_op_calc(
"sum", np.sum, mixed_float_frame.astype("float32"), check_dtype=False,
"sum",
np.sum,
mixed_float_frame.astype("float32"),
check_dtype=False,
check_less_precise=True,
)

assert_stat_op_calc(
Expand Down
6 changes: 4 additions & 2 deletions pandas/tests/io/test_sql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2372,7 +2372,7 @@ def test_write_row_by_row(self):

result = sql.read_sql("select * from test", con=self.conn)
result.index = frame.index
tm.assert_frame_equal(result, frame)
tm.assert_frame_equal(result, frame, check_less_precise=True)

def test_execute(self):
frame = tm.makeTimeDataFrame()
Expand Down Expand Up @@ -2632,7 +2632,9 @@ def test_write_row_by_row(self):

result = sql.read_sql("select * from test", con=self.conn)
result.index = frame.index
tm.assert_frame_equal(result, frame)
tm.assert_frame_equal(result, frame, check_less_precise=True)
# GH#32571 result comes back rounded to 6 digits in some builds;
# no obvious pattern

def test_chunksize_read_type(self):
frame = tm.makeTimeDataFrame()
Expand Down