Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions setupext.py
Original file line number Diff line number Diff line change
Expand Up @@ -972,13 +972,19 @@ def check(self):

if sys.version_info[0] >= 3:
required = [2, 0, 0]
if [int(x) for x in pyparsing.__version__.split('.')] < required:
return (
"matplotlib requires pyparsing >= {0} on Python 3.x".format(
'.'.join(str(x) for x in required)))
else:
required = [1, 5, 6]
if [int(x) for x in pyparsing.__version__.split('.')] < required:
return (
"matplotlib requires pyparsing >= {0} on Python {1}".format(
'.'.join(str(x) for x in required),
sys.version_info[0]))
if [int(x) for x in pyparsing.__version__.split('.')] < required:
return (
"matplotlib requires pyparsing >= {0} on Python 2.x".format(
'.'.join(str(x) for x in required)))
if pyparsing.__version__ == "2.0.0":
return (
"pyparsing 2.0.0 is not compatible with Python 2.x")

return "using pyparsing version %s" % pyparsing.__version__

Expand All @@ -987,7 +993,7 @@ def get_install_requires(self):
return ['pyparsing>=1.5.6']
else:
# pyparsing >= 2.0.0 is not compatible with Python 2
return ['pyparsing>=1.5.6,<2.0.0']
return ['pyparsing>=1.5.6,!=2.0.0']


class BackendAgg(OptionalBackendPackage):
Expand Down