8000 Merge pull request #6931 from jenshnielsen/pyparsing · matplotlib/matplotlib@0b88da5 · GitHub
[go: up one dir, main page]
Skip to content

Commit 0b88da5

Browse files
jenshnielsenjenshnielsen
authored
Merge pull request #6931 from jenshnielsen/pyparsing
Disallow pyparsing 2.1.6 which breaks test_mathtext_exceptions
2 parents 29fd193 + 48e3406 commit 0b88da5

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ install:
7777
pip install --upgrade setuptools
7878
# Install only from travis wheelhouse
7979
- if [ -z "$PRE" ]; then
80-
wheelhouse_pip_install python-dateutil $NUMPY $PANDAS pyparsing!=2.1.2 pillow sphinx!=1.3.0;
80+
wheelhouse_pip_install python-dateutil $NUMPY $PANDAS pyparsing!=2.1.6 pillow sphinx!=1.3.0;
8181
else
82-
pip install $PRE python-dateutil $NUMPY pyparsing!=2.1.2 pillow sphinx!=1.3.0;
82+
pip install $PRE python-dateutil $NUMPY pyparsing!=2.1.6 pillow sphinx!=1.3.0;
8383
fi
8484
# Always install from pypi
8585
- pip install $PRE pep8 cycler

‎setupext.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1477,7 +1477,7 @@ def check(self):
14771477
return "using pyparsing version %s" % pyparsing.__version__
14781478

14791479
def get_install_requires(self):
1480-
versionstring = 'pyparsing>=1.5.6,!=2.0.4,!=2.1.2'
1480+
versionstring = 'pyparsing>=1.5.6,!=2.0.4,!=2.1.2,!=2.1.6'
14811481
if self.is_ok():
14821482
return [versionstring]
14831483
else:

0 commit comments

Comments
 (0)
0