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

CI/TST #34131 fixed test_floordiv_axis0_numexpr_path #34537

Merged
merged 11 commits into from
Jun 14, 2020
Merged

CI/TST #34131 fixed test_floordiv_axis0_numexpr_path #34537

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c01ee01
CI/TST #34131 fixed test_floordiv_axis0_numexpr_path
OlivierLuG Jun 2, 2020
7fe0fee
CI/TST #34131 fixed test_floordiv_axis0_numexpr_path (2)
OlivierLuG Jun 3, 2020
d6bff92
CI/TST #34131 fixed test_floordiv_axis0_numexpr_path (2)
OlivierLuG Jun 3, 2020
063b097
Merge branch 'CI_#34131_slow_test_floordiv_axis0_numexpr_path' of git…
OlivierLuG Jun 7, 2020
b73fae0
#34131 explicit check of _USE_NUNEXPR
OlivierLuG Jun 13, 2020
bbf80ce
#34131 fix one test failure
OlivierLuG Jun 13, 2020
408da4a
CI #34131 fix tests failure
OlivierLuG Jun 13, 2020
7935634
CI #34131 fix the linting
OlivierLuG Jun 13, 2020
2ca3041
CI #34131 fix the linting, 3rd attempt
OlivierLuG Jun 13, 2020
5ff6b2d
#34131 review taken into account
OlivierLuG Jun 14, 2020
a067c92
#34131 review taken into account + linting
OlivierLuG Jun 14, 2020
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
5 changes: 3 additions & 2 deletions pandas/tests/frame/test_arithmetic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from pandas import DataFrame, MultiIndex, Series
import pandas._testing as tm
import pandas.core.common as com
from pandas.core.computation.expressions import _MIN_ELEMENTS, _NUMEXPR_INSTALLED
from pandas.tests.frame.common import _check_mixed_float, _check_mixed_int

# -------------------------------------------------------------------
Expand Down Expand Up @@ -374,13 +375,13 @@ def test_floordiv_axis0(self):
result2 = df.floordiv(ser.values, axis=0)
tm.assert_frame_equal(result2, expected)

@pytest.mark.slow
@pytest.mark.skipif(not _NUMEXPR_INSTALLED, reason="numexpr not installed")
@pytest.mark.parametrize("opname", ["floordiv", "pow"])
OlivierLuG marked this conversation as resolved.
Show resolved Hide resolved
def test_floordiv_axis0_numexpr_path(self, opname):
# case that goes through numexpr and has to fall back to masked_arith_op
op = getattr(operator, opname)

arr = np.arange(10 ** 6).reshape(100, -1)
OlivierLuG marked this conversation as resolved.
Show resolved Hide resolved
arr = np.arange(_MIN_ELEMENTS + 100).reshape(_MIN_ELEMENTS // 100 + 1, -1) * 100
df = pd.DataFrame(arr)
df["C"] = 1.0

Expand Down