matplotlib
diff --git a/‎.travis.yml
Lines changed: 6 additions & 2 deletions b/‎.travis.yml
Lines changed: 6 additions & 2 deletions
diff --git a/‎lib/matplotlib/__init__.py
Lines changed: 2 additions & 2 deletions b/‎lib/matplotlib/__init__.py
Lines changed: 2 additions & 2 deletions
diff --git a/‎setupext.py
Lines changed: 13 additions & 7 deletions b/‎setupext.py
Lines changed: 13 additions & 7 deletions
@@ -6,14 +6,18 @@ python:
   - 3.2
 
 install:
-  - pip install --use-mirrors nose python-dateutil pyparsing
+  - pip install --use-mirrors nose python-dateutil
+  # This is a workaround to install the latest versions of pyparsing,
+  # which are not yet available on PyPI
+  - 'if [ $TRAVIS_PYTHON_VERSION == "3.2" ]; then pip install http://sourceforge.net/projects/pyparsing/files/pyparsing/pyparsing-2.0.0/pyparsing-2.0.0.tar.gz; fi'
+  - 'if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then pip install http://sourceforge.net/projects/pyparsing/files/pyparsing/pyparsing-1.5.7/pyparsing-1.5.7.tar.gz; fi'
   # This is a workaround to install numpy with the version of
   # virtualenv in Travis.  If that is updated in the future, this can
   # be simplified to 'pip install numpy'
   - 'if [ $TRAVIS_PYTHON_VERSION == "3.2" ]; then pip install https://github.com/y-p/numpy/archive/1.6.2_with_travis_fix.tar.gz; fi'
   - 'if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then pip install numpy; fi' # should be nop if pre-installed
   - if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then pip install --use-mirrors PIL; fi
-  - python setup.py install --old-and-unmanageable
+  - python setup.py install
 
 script:
   - mkdir ../foo
 
@@ -115,9 +115,9 @@
     raise ImportError("matplotlib requires pyparsing")
 else:
     if sys.version_info[0] >= 3:
-        if [int(x) for x in pyparsing.__version__.split('.')] <= [1, 5, 6]:
+        if [int(x) for x in pyparsing.__version__.split('.')] < [2, 0, 0]:
             raise ImportError(
-                "matplotlib requires pyparsing > 1.5.6 on Python 3.x")
+                "matplotlib requires pyparsing >= 2.0.0 on Python 3.x")
 
 import os, re, shutil, subprocess, warnings
 import distutils.sysconfig
 
@@ -598,6 +598,9 @@ def get_package_data(self):
                 'tests/test_rcparams.rc'
             ]}
 
+    def get_install_requires(self):
+        return ['nose']
+
 
 class Numpy(SetupPackage):
     name = "numpy"
@@ -607,13 +610,13 @@ def check(self):
         try:
             import numpy
         except ImportError:
-            raise CheckFailed(
-                "Requires numpy %s or later.  (Numpy not found)" %
+            raise SystemExit(
+                "Requires numpy %s or later to build.  (Numpy not found)" %
                 min_version)
 
         if not is_min_version(numpy.__version__, min_version):
-            raise CheckFailed(
-                "Requires numpy %s or later.  (Found %s)" %
+            raise SystemExit(
+                "Requires numpy %s or later to build.  (Found %s)" %
                 (min_version, numpy.__version__))
 
         ext = make_extension('test', [])
@@ -921,14 +924,17 @@ def check(self):
                 "after matplotlib.")
 
         if sys.version_info[0] >= 3:
-            if [int(x) for x in pyparsing.__version__.split('.')] <= [1, 5, 6]:
+            if [int(x) for x in pyparsing.__version__.split('.')] < [2, 0, 0]:
                 return (
-                    "matplotlib requires pyparsing > 1.5.6 on Python 3.x")
+                    "matplotlib requires pyparsing >= 2.0.0 on Python 3.x")
 
         return "using pyparsing version %s" % pyparsing.__version__
 
     def get_install_requires(self):
-        return ['pyparsing']
+        if sys.version_info[0] >= 3:
+            return ['pyparsing>=2.0.0']
+        else:
+            return ['pyparsing']
 
 
 class BackendAgg(OptionalBackendPackage):