Skip to content

Commit 14eb7cb

Browse files
jbrockmendelSeeminSyed
authored andcommitted
TST: revert parts of pandas-dev#32571 (pandas-dev#32630)
1 parent c33ee73 commit 14eb7cb

File tree

2 files changed

+30
-7
lines changed

2 files changed

+30
-7
lines changed

pandas/tests/frame/test_analytics.py

+26-5
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ def assert_stat_op_calc(
3232
has_skipna=True,
3333
check_dtype=True,
3434
check_dates=False,
35+
check_less_precise=False,
3536
skipna_alternative=None,
3637
):
3738
"""
@@ -53,6 +54,9 @@ def assert_stat_op_calc(
5354
"alternative(frame)" should be checked.
5455
check_dates : bool, default false
5556
Whether opname should be tested on a Datetime Series
57+
check_less_precise : bool, default False
58+
Whether results should only be compared approximately;
59+
passed on to tm.assert_series_equal
5660
skipna_alternative : function, default None
5761
NaN-safe version of alternative
5862
"""
@@ -80,24 +84,35 @@ def wrapper(x):
8084
result0 = f(axis=0, skipna=False)
8185
result1 = f(axis=1, skipna=False)
8286
tm.assert_series_equal(
83-
result0, frame.apply(wrapper), check_dtype=check_dtype,
87+
result0,
88+
frame.apply(wrapper),
89+
check_dtype=check_dtype,
90+
check_less_precise=check_less_precise,
8491
)
8592
# HACK: win32
8693
tm.assert_series_equal(
87-
result1, frame.apply(wrapper, axis=1), check_dtype=False,
94+
result1,
95+
frame.apply(wrapper, axis=1),
96+
check_dtype=False,
97+
check_less_precise=check_less_precise,
8898
)
8999
else:
90100
skipna_wrapper = alternative
91101

92102
result0 = f(axis=0)
93103
result1 = f(axis=1)
94104
tm.assert_series_equal(
95-
result0, frame.apply(skipna_wrapper), check_dtype=check_dtype,
105+
result0,
106+
frame.apply(skipna_wrapper),
107+
check_dtype=check_dtype,
108+
check_less_precise=check_less_precise,
96109
)
97110

98111
if opname in ["sum", "prod"]:
99112
expected = frame.apply(skipna_wrapper, axis=1)
100-
tm.assert_series_equal(result1, expected, check_dtype=False)
113+
tm.assert_series_equal(
114+
result1, expected, check_dtype=False, check_less_precise=check_less_precise
115+
)
101116

102117
# check dtypes
103118
if check_dtype:
@@ -316,9 +331,15 @@ def kurt(x):
316331
check_dates=True,
317332
)
318333

334+
# GH#32571 check_less_precise is needed on apparently-random
335+
# py37-npdev builds and OSX-PY36-min_version builds
319336
# mixed types (with upcasting happening)
320337
assert_stat_op_calc(
321-
"sum", np.sum, mixed_float_frame.astype("float32"), check_dtype=False,
338+
"sum",
339+
np.sum,
340+
mixed_float_frame.astype("float32"),
341+
check_dtype=False,
342+
check_less_precise=True,
322343
)
323344

324345
assert_stat_op_calc(

pandas/tests/io/test_sql.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -2372,7 +2372,7 @@ def test_write_row_by_row(self):
23722372

23732373
result = sql.read_sql("select * from test", con=self.conn)
23742374
result.index = frame.index
2375-
tm.assert_frame_equal(result, frame)
2375+
tm.assert_frame_equal(result, frame, check_less_precise=True)
23762376

23772377
def test_execute(self):
23782378
frame = tm.makeTimeDataFrame()
@@ -2632,7 +2632,9 @@ def test_write_row_by_row(self):
26322632

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

26372639
def test_chunksize_read_type(self):
26382640
frame = tm.makeTimeDataFrame()

0 commit comments

Comments
 (0)