File tree 2 files changed +9
-7
lines changed
2 files changed +9
-7
lines changed Original file line number Diff line number Diff line change 3
3
from distutils .version import LooseVersion
4
4
5
5
_NUMEXPR_INSTALLED = False
6
+ _MIN_NUMEXPR_VERSION = "2.4.6"
6
7
7
8
try :
8
9
import numexpr as ne
9
10
ver = ne .__version__
10
- _NUMEXPR_INSTALLED = ver >= LooseVersion ('2.4.6' )
11
+ _NUMEXPR_INSTALLED = ver >= LooseVersion (_MIN_NUMEXPR_VERSION )
11
12
12
13
if not _NUMEXPR_INSTALLED :
13
14
warnings .warn (
14
15
"The installed version of numexpr {ver} is not supported "
15
16
"in pandas and will be not be used\n The minimum supported "
16
- "version is 2.4.6\n " .format (ver = ver ), UserWarning )
17
+ "version is {min_ver}\n " .format (ver = ver ,
18
+ min_ver = _MIN_NUMEXPR_VERSION ), UserWarning )
17
19
18
20
except ImportError : # pragma: no cover
19
21
pass
Original file line number Diff line number Diff line change 10
10
11
11
from pandas .computation .engines import _engines
12
12
import pandas .computation .expr as expr
13
+ from pandas .computation import _MIN_NUMEXPR_VERSION
14
+
13
15
14
16
ENGINES_PARSERS = list (product (_engines , expr ._parsers ))
15
17
@@ -21,7 +23,7 @@ def test_compat():
21
23
try :
22
24
import numexpr as ne
23
25
ver = ne .__version__
24
- if ver < LooseVersion ('2.4.6' ):
26
+ if ver < LooseVersion (_MIN_NUMEXPR_VERSION ):
25
27
with tm .assert_produces_warning (UserWarning ,
26
28
check_stacklevel = False ):
27
29
assert not _NUMEXPR_INSTALLED
@@ -49,12 +51,10 @@ def testit():
49
51
except ImportError :
50
52
pytest .skip ("no numexpr" )
51
53
else :
52
- if ne .__version__ < LooseVersion ('2.1' ):
54
+ if ne .__version__ < LooseVersion (_MIN_NUMEXPR_VERSION ):
53
55
with tm .assertRaisesRegexp (ImportError , "'numexpr' version is "
54
- ".+, must be >= 2.1" ):
56
+ ".+, must be >= %s" % _MIN_NUMEXPR_VERSION ):
55
57
testit ()
56
- elif ne .__version__ == LooseVersion ('2.4.4' ):
57
- pytest .skip ("numexpr version==2.4.4" )
58
58
else :
59
59
testit ()
60
60
else :
You can’t perform that action at this time.
0 commit comments