-
-
Notifications
You must be signed in to change notification settings - Fork 18.6k
Numexpr 2.4.6 #15383
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.
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
Numexpr 2.4.6 #15383
Changes from 15 commits
ab79c54
ac62653
6e12e29
e45b742
8bd4ed1
f225598
3b6e58b
93f54aa
7a275ce
7575ba2
c1aae19
0d4ab9a
73f0319
c081199
e1b34a9
c417fe2
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,7 +9,7 @@ html5lib | |
patsy | ||
beautiful-soup | ||
scipy | ||
numexpr=2.4.4 | ||
numexpr=2.4.6 | ||
pytables | ||
matplotlib | ||
lxml | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,6 +10,12 @@ | |
|
||
from pandas.computation.engines import _engines | ||
import pandas.computation.expr as expr | ||
from pandas.computation import _MIN_NUMEXPR_VERSION | ||
# Get reload for Python 3.4 and on, if not, use internal reload() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. too complicated, don't reload |
||
try: | ||
from importlib import reload | ||
except ImportError: | ||
pass | ||
|
||
ENGINES_PARSERS = list(product(_engines, expr._parsers)) | ||
|
||
|
@@ -21,12 +27,11 @@ def test_compat(): | |
try: | ||
import numexpr as ne | ||
ver = ne.__version__ | ||
if ver == LooseVersion('2.4.4'): | ||
assert not _NUMEXPR_INSTALLED | ||
elif ver < LooseVersion('2.1'): | ||
if ver < LooseVersion(_MIN_NUMEXPR_VERSION): | ||
with tm.assert_produces_warning(UserWarning, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. just remove this |
||
check_stacklevel=False): | ||
assert not _NUMEXPR_INSTALLED | ||
reload(pd.computation) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. too complicated |
||
assert not _NUMEXPR_INSTALLED | ||
else: | ||
assert _NUMEXPR_INSTALLED | ||
|
||
|
@@ -51,12 +56,9 @@ def testit(): | |
except ImportError: | ||
pytest.skip("no numexpr") | ||
else: | ||
if ne.__version__ < LooseVersion('2.1'): | ||
with tm.assertRaisesRegexp(ImportError, "'numexpr' version is " | ||
".+, must be >= 2.1"): | ||
if ne.__version__ < LooseVersion(_MIN_NUMEXPR_VERSION): | ||
with tm.assertRaises(ImportError): | ||
testit() | ||
elif ne.__version__ == LooseVersion('2.4.4'): | ||
pytest.skip("numexpr version==2.4.4") | ||
else: | ||
testit() | ||
else: | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
there is a test for this i think
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep. Addressed in f225598.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
and fixed a typo in 7a275ce