Skip to content

Commit

Permalink
Merge pull request #1794 from astrofrog/fix-pyparsing-requirement
Browse files Browse the repository at this point in the history
Fix for #1792
  • Loading branch information
mdboom committed Feb 27, 2013
2 parents 0c6f12a + 5ca9060 commit aadc894
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion setupext.py
Original file line number Diff line number Diff line change
Expand Up @@ -939,7 +939,8 @@ def get_install_requires(self):
if sys.version_info[0] >= 3:
return ['pyparsing>=2.0.0']
else:
return ['pyparsing>=1.5.6']
# pyparsing >= 2.0.0 is not compatible with Python 2
return ['pyparsing>=1.5.6,<2.0.0']


class BackendAgg(OptionalBackendPackage):
Expand Down

0 comments on commit aadc894

Please sign in to comment.