Merge pull request #5346 from jenshnielsen/nopyparsing204

mdboom · mdboom · commit 9ed4cbcb4230 · 2015-10-29T07:28:37.000-04:00
Make sure that pyparsing 2.0.4 is not installed.
diff --git a/.travis.yml b/.travis.yml
@@ -62,9 +62,9 @@ install:
     pip install --upgrade setuptools
   # Install only from travis wheelhouse
   - if [ -z "$PRE" ]; then
-        wheelhouse_pip_install python-dateutil $NUMPY $PANDAS pyparsing pillow sphinx!=1.3.0 $MOCK;
+        wheelhouse_pip_install python-dateutil $NUMPY $PANDAS pyparsing!=2.0.4 pillow sphinx!=1.3.0 $MOCK;
     else
-        pip install $PRE python-dateutil $NUMPY pyparsing pillow sphinx!=1.3.0;
+        pip install $PRE python-dateutil $NUMPY pyparsing!=2.0.4 pillow sphinx!=1.3.0;
     fi
   # Always install from pypi
   - pip install $PRE pep8 cycler
diff --git a/setupext.py b/setupext.py
@@ -1261,7 +1261,7 @@ def check(self):
 
 class Pyparsing(SetupPackage):
     name = "pyparsing"
-
+    # pyparsing 2.0.4 has broken python 3 support.
     def is_ok(self):
         # pyparsing 2.0.0 bug, but it may be patched in distributions
         try:
@@ -1297,9 +1297,9 @@ def check(self):
 
     def get_install_requires(self):
         if self.is_ok():
-            return ['pyparsing>=1.5.6']
+            return ['pyparsing>=1.5.6,!=2.0.4']
         else:
-            return ['pyparsing>=1.5.6,!=2.0.0']
+            return ['pyparsing>=1.5.6,!=2.0.0,!=2.0.4']
 
 
 class BackendAgg(OptionalBackendPackage):
