File tree Expand file tree Collapse file tree 2 files changed +5
-3
lines changed Expand file tree Collapse file tree 2 files changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -72,7 +72,7 @@ install:
72
72
pip install --upgrade setuptools
73
73
# Install only from travis wheelhouse
74
74
- if [ -z "$PRE" ]; then
75
- wheelhouse_pip_install python-dateutil $NUMPY $PANDAS pyparsing!=2.0.4 pillow sphinx!=1.3.0;
75
+ wheelhouse_pip_install python-dateutil $NUMPY $PANDAS pyparsing!=2.1.2 pillow sphinx!=1.3.0;
76
76
else
77
77
pip install $PRE python-dateutil $NUMPY pyparsing!=2.0.4 pillow sphinx!=1.3.0;
78
78
fi
Original file line number Diff line number Diff line change @@ -1239,6 +1239,7 @@ def check(self):
1239
1239
class Pyparsing (SetupPackage ):
1240
1240
name = "pyparsing"
1241
1241
# pyparsing 2.0.4 has broken python 3 support.
1242
+ # pyparsing 2.1.2 is broken in python3.4/3.3.
1242
1243
def is_ok (self ):
1243
1244
# pyparsing 2.0.0 bug, but it may be patched in distributions
1244
1245
try :
@@ -1273,10 +1274,11 @@ def check(self):
1273
1274
return "using pyparsing version %s" % pyparsing .__version__
1274
1275
1275
1276
def get_install_requires (self ):
1277
+ versionstring = 'pyparsing>=1.5.6,!=2.0.4,!=2.1.2'
1276
1278
if self .is_ok ():
1277
- return ['pyparsing>=1.5.6,!=2.0.4' ]
1279
+ return [versionstring ]
1278
1280
else :
1279
- return ['pyparsing>=1.5.6 ,!=2.0.0,!=2.0.4 ' ]
1281
+ return [versionstring + ' ,!=2.0.0' ]
1280
1282
1281
1283
1282
1284
class BackendAgg (OptionalBackendPackage ):
You can’t perform that action at this time.
0 commit comments