Fix pyparsing minimum requirements

mdboom · mdboom · commit 0c6f12aa8d07 · 2013-02-26T15:19:47.000-05:00
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -115,9 +115,14 @@
     raise ImportError("matplotlib requires pyparsing")
 else:
     if sys.version_info[0] >= 3:
-        if [int(x) for x in pyparsing.__version__.split('.')] < [2, 0, 0]:
-            raise ImportError(
-                "matplotlib requires pyparsing >= 2.0.0 on Python 3.x")
+        _required = [2, 0, 0]
+    else:
+        _required = [1, 5, 6]
+    if [int(x) for x in pyparsing.__version__.split('.')] < _required:
+        raise ImportError(
+            "matplotlib requires pyparsing >= {0} on Python {1}".format(
+                '.'.join(str(x) for x in _required),
+                sys.version_info[0]))
 
 import os, re, shutil, subprocess, warnings
 import distutils.sysconfig
diff --git a/setupext.py b/setupext.py
@@ -924,17 +924,22 @@ def check(self):
                 "after matplotlib.")
 
         if sys.version_info[0] >= 3:
-            if [int(x) for x in pyparsing.__version__.split('.')] < [2, 0, 0]:
-                return (
-                    "matplotlib requires pyparsing >= 2.0.0 on Python 3.x")
+            required = [2, 0, 0]
+        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]))
 
         return "using pyparsing version %s" % pyparsing.__version__
 
     def get_install_requires(self):
         if sys.version_info[0] >= 3:
             return ['pyparsing>=2.0.0']
         else:
-            return ['pyparsing']
+            return ['pyparsing>=1.5.6']
 
 
 class BackendAgg(OptionalBackendPackage):
