Handle dateutil and pyparsing in the same manner as everything else.

Author: mdboom

setup.cfg.template

@@ -11,33 +11,16 @@
 [status]
 # To suppress display of the dependencies and their versions
 # at the top of the build log, uncomment the following line:
-#suppress = True
-#
-# Uncomment to insert lots of diagnostic prints in extension code
-#verbose = True
+#suppress = False
 
 [packages]
 # There are a number of subpackages of matplotlib that are considered
 # optional.  They are all installed by default, but they may be turned
 # off here.
 #
-#tests = False
-#sample_data = False
-#toolkits = False
-
-[provide_packages]
-# By default, matplotlib checks for a few dependencies and
-# installs them if missing. This feature can be turned off
-# by uncommenting the following lines. Acceptible values are:
-#     True: install, overwrite an existing installation
-#     False: do not install
-#     auto: install only if the package is unavailable. This
-#           is the default behavior
-#
-## Date/timezone support:
-#pytz = False
-#dateutil = False
-#six = False
+#tests = True
+#sample_data = True
+#toolkits = True
 
 [gui_support]
 # Matplotlib supports multiple GUI toolkits, including Cocoa,
@@ -46,29 +29,36 @@
 # which is provided by matplotlib and built by default.
 #
 # Some backends are written in pure Python, and others require
-# extension code to be compiled. By default, matplotlib checks
-# for these GUI toolkits during installation and, if present,
-# compiles the required extensions to support the toolkit. GTK
-# support requires the GTK runtime environment and PyGTK. Wx
-# support requires wxWidgets and wxPython. Tk support requires
-# Tk and Tkinter. The other GUI toolkits do not require any
-# extension code, and can be used as long as the libraries are
-# installed on your system.
+# extension code to be compiled. By default, matplotlib checks for
+# these GUI toolkits during installation and, if present, compiles the
+# required extensions to support the toolkit.
+#
+# - GTK 2.x support of any kind requires the GTK runtime environment
+#   headers and PyGTK.
+# - Tk support requires Tk development headers and Tkinter.
+# - Mac OSX backend requires the Cocoa headers included with XCode.
+# - Windowing is MS-Windows specific, and requires the "windows.h"
+#   header.
+#
+# The other GUI toolkits do not require any extension code, and can be
+# used as long as the libraries are installed on your system --
+# therefore they are installed unconditionally.
+#
+# You can uncomment any the following lines to change this
+# behavior. Acceptible values are:
 #
-# You can uncomment any the following lines if you know you do
-# not want to use the GUI toolkit. Acceptible values are:
 #     True: build the extension. Exits with a warning if the
 #           required dependencies are not available
 #     False: do not build the extension
 #     auto: build if the required dependencies are available,
 #           otherwise skip silently. This is the default
 #           behavior
 #
-#gtk = False
-#gtkagg = False
-#tkagg = False
-#macosx = False
-#windowing = False
+#gtk = auto
+#gtkagg = auto
+#tkagg = auto
+#macosx = auto
+#windowing = auto
 
 [rc_options]
 # User-configurable options
@@ -77,7 +67,7 @@
 # FltkAgg, MacOSX, Pdf, Ps, QtAgg, Qt4Agg, SVG, TkAgg, WX, WXAgg.
 #
 # The Agg, Ps, Pdf and SVG backends do not require external
-# dependencies. Do not choose GTK, GTKAgg, GTKCairo, MacOSX, TkAgg or WXAgg
+# dependencies. Do not choose GTK, GTKAgg, GTKCairo, MacOSX, or TkAgg
 # if you have disabled the relevent extension modules.  Agg will be used
 # by default.
 #

setup.py

@@ -38,7 +38,7 @@
 __version__ = setupext.Matplotlib().check()
 
 
-# These are the packages in the order we want to build them.  This
+# These are the packages in the order we want to display them.  This
 # list may contain strings to create section headers for the display.
 mpl_packages = [
     'Building Matplotlib',
@@ -47,6 +47,8 @@
     setupext.Platform(),
     'Required dependencies and extensions',
     setupext.Numpy(),
+    setupext.Dateutil(),
+    setupext.Pyparsing(),
     setupext.CXX(),
     setupext.LibAgg(),
     setupext.FreeType(),
@@ -92,6 +94,7 @@
 ext_modules = []
 package_data = {}
 package_dir = {'': 'lib'}
+install_requires = []
 default_backend = None
 
 
@@ -149,6 +152,7 @@
     for key, val in data.items():
         package_data.setdefault(key, [])
         package_data[key] = list(set(val + package_data[key]))
+    install_requires.extend(package.get_install_requires())
 
 # Write the default matplotlibrc file
 if default_backend is None:
@@ -204,7 +208,7 @@
       classifiers=classifiers,
 
       # List third-party Python packages that we require
-      install_requires=['dateutils', 'pyparsing'],
+      install_requires=install_requires,
 
       # Automatically 2to3 source on Python 3.x
       use_2to3=True,
@@ -214,11 +218,10 @@
       # check for zip safety.
       zip_safe=False,
 
-      # This option is important -- it reverts to the standard
-      # distutils installation method.  Otherwise, the behavior is to
-      # build an egg and install that, which unfortunately, makes
-      # building and importing much slower.
-      options={
-          'install': {'old_and_unmanageable': 'True'}
-          }
+      # Install our nose plugin so it will always be found
+      entry_points={
+          'nose.plugins.0.10': [
+              'KnownFailure = matplotlib.testing.noseclasses:KnownFailure'
+            ]
+        },
      )

setupext.py

@@ -43,11 +43,6 @@
     except:
         pass
 
-    try:
-        options['verbose'] = not config.getboolean("status", "verbose")
-    except:
-        pass
-
     try:
         options['backend'] = config.get("rc_options", "backend")
     except:
@@ -249,7 +244,7 @@ def setup_extension(self, ext, package, default_include_dirs=[],
         """
         flag_map = {
             '-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries'}
-        command = "pkg-config --libs --cflags {0}".format(package)
+        command = "pkg-config --libs --cflags " + package
 
         use_defaults = True
         if self.has_pkgconfig:
@@ -349,6 +344,14 @@ def get_extension(self):
         """
         return None
 
+    def get_install_requires(self):
+        """
+        Get a list of Python packages that we require.
+        pip/easy_install will attempt to download and install this
+        package if it is not installed.
+        """
+        return []
+
     def _check_for_pkg_config(self, package, include_file, min_version=None,
                               version=None):
         """
@@ -803,6 +806,42 @@ def get_extension(self):
         return ext
 
 
+class Dateutil(SetupPackage):
+    name = "dateutil"
+
+    def check(self):
+        try:
+            import dateutil
+        except ImportError:
+            return (
+                "dateutil was not found. It is required for date axis "
+                "support. pip/easy_install may attempt to install it "
+                "after matplotlib.")
+
+        return "using dateutil version %s" % dateutil.__version__
+
+    def get_install_requires(self):
+        return ['python_dateutil']
+
+
+class Pyparsing(SetupPackage):
+    name = "pyparsing"
+
+    def check(self):
+        try:
+            import pyparsing
+        except ImportError:
+            return (
+                "pyparsing was not found. It is required for mathtext "
+                "support. pip/easy_install may attempt to install it "
+                "after matplotlib.")
+
+        return "using pyparsing version %s" % pyparsing.__version__
+
+    def get_install_requires(self):
+        return ['pyparsing']
+
+
 class BackendAgg(OptionalBackendPackage):
     name = "agg"
     force = False
@@ -874,6 +913,7 @@ def get_extension(self):
 
         ext = make_extension('matplotlib.backends._tkagg', sources)
         self.add_flags(ext)
+        Numpy().add_flags(ext)
         LibAgg().add_flags(ext)
         CXX().add_flags(ext)
         return ext
@@ -1250,6 +1290,8 @@ def get_extension(self):
         ext = make_extension('matplotlib.backends._gtkagg', sources)
         self.add_flags(ext)
         LibAgg().add_flags(ext)
+        CXX().add_flags(ext)
+        Numpy().add_flags(ext)
         return ext