Skip to content

TST/CLN: parametrize and clean test_expressions, test_nanops #28553

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 19 commits into from
Sep 23, 2019
Merged

TST/CLN: parametrize and clean test_expressions, test_nanops #28553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
61bdf3f
CLN: stop catching BaseException
jbrockmendel Sep 19, 2019
b2ac45d
CLN: Exception in nanops
jbrockmendel Sep 19, 2019
576032c
parametrize
jbrockmendel Sep 19, 2019
e47b58d
checkpoint
jbrockmendel Sep 19, 2019
de32a8f
parametrize
jbrockmendel Sep 19, 2019
4ee11b9
checkpoint
jbrockmendel Sep 19, 2019
66e47e8
checkpoint
jbrockmendel Sep 19, 2019
1fe35e4
Merge branch 'master' of https://github.com/pandas-dev/pandas into fa…
jbrockmendel Sep 20, 2019
7e6534a
Merge branch 'master' of https://github.com/pandas-dev/pandas into fa…
jbrockmendel Sep 20, 2019
669d682
Merge branch 'master' of https://github.com/pandas-dev/pandas into fa…
jbrockmendel Sep 20, 2019
1800f1f
revert
jbrockmendel Sep 20, 2019
778d654
TST: parametrize, catch less
jbrockmendel Sep 20, 2019
1cd77b4
parametrize
jbrockmendel Sep 20, 2019
7fc298c
CLN: remove always-False condition, redundant arg
jbrockmendel Sep 20, 2019
4dda70a
CLN: unnecessary args, parametrize
jbrockmendel Sep 20, 2019
2d1ab83
cleanup, comments
jbrockmendel Sep 20, 2019
dc89f2d
parametrize
jbrockmendel Sep 20, 2019
0503c8e
CLN
jbrockmendel Sep 20, 2019
73bb58f
CLN
jbrockmendel Sep 20, 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
94 changes: 44 additions & 50 deletions pandas/tests/test_expressions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,12 @@ def run_arithmetic(self, df, other):
operations = ["add", "sub", "mul", "mod", "truediv", "floordiv"]
for test_flex in [True, False]:
for arith in operations:

operator_name = arith

# TODO: share with run_binary
if test_flex:
op = lambda x, y: getattr(x, arith)(y)
op.__name__ = arith
else:
op = getattr(operator, operator_name)
op = getattr(operator, arith)
expr.set_use_numexpr(False)
expected = op(df, other)
expr.set_use_numexpr(True)
Expand All @@ -87,13 +85,14 @@ def run_binary(self, df, other):
for test_flex in [True, False]:
for arith in operations:
if test_flex:
op = lambda x, y: getattr(df, arith)(y)
op = lambda x, y: getattr(x, arith)(y)
op.__name__ = arith
else:
op = getattr(operator, arith)
expr.set_use_numexpr(False)
expected = op(df, other)
expr.set_use_numexpr(True)

expr.get_test_result()
result = op(df, other)
used_numexpr = expr.get_test_result()
Expand Down Expand Up @@ -167,29 +166,29 @@ def test_invalid(self):
"opname,op_str",
[("add", "+"), ("sub", "-"), ("mul", "*"), ("truediv", "/"), ("pow", "**")],
)
def test_binary_ops(self, opname, op_str):
@pytest.mark.parametrize("left,right", [(_frame, _frame2), (_mixed, _mixed2)])
def test_binary_ops(self, opname, op_str, left, right):
def testit():

for f, f2 in [(self.frame, self.frame2), (self.mixed, self.mixed2)]:
if opname == "pow":
# TODO: get this working
return

if opname == "pow":
continue
op = getattr(operator, opname)

op = getattr(operator, opname)
result = expr._can_use_numexpr(op, op_str, left, left, "evaluate")
assert result != left._is_mixed_type

result = expr._can_use_numexpr(op, op_str, f, f, "evaluate")
assert result != f._is_mixed_type
result = expr.evaluate(op, op_str, left, left, use_numexpr=True)
expected = expr.evaluate(op, op_str, left, left, use_numexpr=False)

result = expr.evaluate(op, op_str, f, f, use_numexpr=True)
expected = expr.evaluate(op, op_str, f, f, use_numexpr=False)
if isinstance(result, DataFrame):
tm.assert_frame_equal(result, expected)
else:
tm.assert_numpy_array_equal(result, expected.values)

if isinstance(result, DataFrame):
tm.assert_frame_equal(result, expected)
else:
tm.assert_numpy_array_equal(result, expected.values)

result = expr._can_use_numexpr(op, op_str, f2, f2, "evaluate")
assert not result
result = expr._can_use_numexpr(op, op_str, right, right, "evaluate")
assert not result

expr.set_use_numexpr(False)
testit()
Expand All @@ -210,30 +209,26 @@ def testit():
("ne", "!="),
],
)
def test_comparison_ops(self, opname, op_str):
@pytest.mark.parametrize("left,right", [(_frame, _frame2), (_mixed, _mixed2)])
def test_comparison_ops(self, opname, op_str, left, right):
def testit():
for f, f2 in [(self.frame, self.frame2), (self.mixed, self.mixed2)]:

f11 = f
f12 = f + 1
f12 = left + 1
f22 = right + 1

f21 = f2
f22 = f2 + 1
op = getattr(operator, opname)

op = getattr(operator, opname)
result = expr._can_use_numexpr(op, op_str, left, f12, "evaluate")
assert result != left._is_mixed_type

result = expr._can_use_numexpr(op, op_str, f11, f12, "evaluate")
assert result != f11._is_mixed_type
result = expr.evaluate(op, op_str, left, f12, use_numexpr=True)
expected = expr.evaluate(op, op_str, left, f12, use_numexpr=False)
if isinstance(result, DataFrame):
tm.assert_frame_equal(result, expected)
else:
tm.assert_numpy_array_equal(result, expected.values)

result = expr.evaluate(op, op_str, f11, f12, use_numexpr=True)
expected = expr.evaluate(op, op_str, f11, f12, use_numexpr=False)
if isinstance(result, DataFrame):
tm.assert_frame_equal(result, expected)
else:
tm.assert_numpy_array_equal(result, expected.values)

result = expr._can_use_numexpr(op, op_str, f21, f22, "evaluate")
assert not result
result = expr._can_use_numexpr(op, op_str, right, f22, "evaluate")
assert not result

expr.set_use_numexpr(False)
testit()
Expand All @@ -244,15 +239,14 @@ def testit():
testit()

@pytest.mark.parametrize("cond", [True, False])
def test_where(self, cond):
@pytest.mark.parametrize("df", [_frame, _frame2, _mixed, _mixed2])
def test_where(self, cond, df):
def testit():
for f in [self.frame, self.frame2, self.mixed, self.mixed2]:

c = np.empty(f.shape, dtype=np.bool_)
c.fill(cond)
result = expr.where(c, f.values, f.values + 1)
expected = np.where(c, f.values, f.values + 1)
tm.assert_numpy_array_equal(result, expected)
c = np.empty(df.shape, dtype=np.bool_)
c.fill(cond)
result = expr.where(c, df.values, df.values + 1)
expected = np.where(c, df.values, df.values + 1)
tm.assert_numpy_array_equal(result, expected)

expr.set_use_numexpr(False)
testit()
Expand All @@ -263,7 +257,7 @@ def testit():
testit()

@pytest.mark.parametrize(
"op_str,opname", list(zip(["/", "//", "**"], ["truediv", "floordiv", "pow"]))
"op_str,opname", [("/", "truediv"), ("//", "floordiv"), ("**", "pow")]
)
def test_bool_ops_raise_on_arithmetic(self, op_str, opname):
df = DataFrame({"a": np.random.rand(10) > 0.5, "b": np.random.rand(10) > 0.5})
Expand Down Expand Up @@ -291,7 +285,7 @@ def test_bool_ops_raise_on_arithmetic(self, op_str, opname):
f(df, True)

@pytest.mark.parametrize(
"op_str,opname", list(zip(["+", "*", "-"], ["add", "mul", "sub"]))
"op_str,opname", [("+", "add"), ("*", "mul"), ("-", "sub")]
)
def test_bool_ops_warn_on_arithmetic(self, op_str, opname):
n = 10
Expand Down
Loading