Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 82ae8ef

Browse files
committed
Block pyparsing 2.1.2 which is broken on python3.4
1 parent 0e9bef9 commit 82ae8ef

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ install:
7272
pip install --upgrade setuptools
7373
# Install only from travis wheelhouse
7474
- 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;
7676
else
7777
pip install $PRE python-dateutil $NUMPY pyparsing!=2.0.4 pillow sphinx!=1.3.0;
7878
fi

setupext.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,6 +1239,7 @@ def check(self):
12391239
class Pyparsing(SetupPackage):
12401240
name = "pyparsing"
12411241
# pyparsing 2.0.4 has broken python 3 support.
1242+
# pyparsing 2.1.2 is broken in python3.4/3.3.
12421243
def is_ok(self):
12431244
# pyparsing 2.0.0 bug, but it may be patched in distributions
12441245
try:
@@ -1273,10 +1274,11 @@ def check(self):
12731274
return "using pyparsing version %s" % pyparsing.__version__
12741275

12751276
def get_install_requires(self):
1277+
versionstring = 'pyparsing>=1.5.6,!=2.0.4,!=2.1.2'
12761278
if self.is_ok():
1277-
return ['pyparsing>=1.5.6,!=2.0.4']
1279+
return [versionstring]
12781280
else:
1279-
return ['pyparsing>=1.5.6,!=2.0.0,!=2.0.4']
1281+
return [versionstring + ',!=2.0.0']
12801282

12811283

12821284
class BackendAgg(OptionalBackendPackage):

0 commit comments

Comments
 (0)