8000 Merge pull request #1794 from astrofrog/fix-pyparsing-requirement · matplotlib/matplotlib@aadc894 · GitHub
[go: up one dir, main page]

Skip to content

Commit aadc894

Browse files
committed
Merge pull request #1794 from astrofrog/fix-pyparsing-requirement
Fix for #1792
2 parents 0c6f12a + 5ca9060 commit aadc894
Copy full SHA for aadc894

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

setupext.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,8 @@ def get_install_requires(self):
939939
if sys.version_info[0] >= 3:
940940
return ['pyparsing>=2.0.0']
941941
else:
942-
return ['pyparsing>=1.5.6']
942+
# pyparsing >= 2.0.0 is not compatible with Python 2
943+
return ['pyparsing>=1.5.6,<2.0.0']
943944

944945

945946
class BackendAgg(OptionalBackendPackage):

0 commit comments

Comments
 (0)
0