Merge pull request #6931 from jenshnielsen/pyparsing

jenshnielsen · web-flow · commit 0b88da5ce487 · 2016-08-09T09:49:40.000+01:00
Disallow pyparsing 2.1.6 which breaks test_mathtext_exceptions
diff --git a/.travis.yml b/.travis.yml
@@ -77,9 +77,9 @@ install:
     pip install --upgrade setuptools
   # Install only from travis wheelhouse
   - if [ -z "$PRE" ]; then
-        wheelhouse_pip_install python-dateutil $NUMPY $PANDAS pyparsing!=2.1.2 pillow sphinx!=1.3.0;
+        wheelhouse_pip_install python-dateutil $NUMPY $PANDAS pyparsing!=2.1.6 pillow sphinx!=1.3.0;
     else
-        pip install $PRE python-dateutil $NUMPY pyparsing!=2.1.2 pillow sphinx!=1.3.0;
+        pip install $PRE python-dateutil $NUMPY pyparsing!=2.1.6 pillow sphinx!=1.3.0;
     fi
   # Always install from pypi
   - pip install $PRE pep8 cycler
diff --git a/setupext.py b/setupext.py
@@ -1477,7 +1477,7 @@ def check(self):
         return "using pyparsing version %s" % pyparsing.__version__
 
     def get_install_requires(self):
-        versionstring = 'pyparsing>=1.5.6,!=2.0.4,!=2.1.2'
+        versionstring = 'pyparsing>=1.5.6,!=2.0.4,!=2.1.2,!=2.1.6'
         if self.is_ok():
             return [versionstring]
         else:
