SF.net SVN: matplotlib: [5431] trunk/matplotlib

[<ds...@us...>]

Revision: 5431
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5431&view=rev
Author:   dsdale
Date:     2008-06-09 08:58:45 -0700 (Mon, 09 Jun 2008)

Log Message:
-----------
dont install enthought.traits

Modified Paths:
--------------
    trunk/matplotlib/CHANGELOG
    trunk/matplotlib/lib/matplotlib/artist.py
    trunk/matplotlib/setup.cfg.template
    trunk/matplotlib/setupext.py

Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2008-06-09 12:13:20 UTC (rev 5430)
+++ trunk/matplotlib/CHANGELOG	2008-06-09 15:58:45 UTC (rev 5431)
@@ -1,3 +1,8 @@
+2008-06-09 Don't install Enthought.Traits along with matplotlib. For 
+           matplotlib developers convenience, it can still be 
+           installed by setting an option in setup.cfg while we figure
+           decide if there is a future for the traited config - DSD
+
 2008-06-09 Added range keyword arg to hist() - MM
 
 2008-06-07 Moved list of backends to rcsetup.py; made use of lower

Modified: trunk/matplotlib/lib/matplotlib/artist.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/artist.py	2008-06-09 12:13:20 UTC (rev 5430)
+++ trunk/matplotlib/lib/matplotlib/artist.py	2008-06-09 15:58:45 UTC (rev 5431)
@@ -179,7 +179,7 @@
     def set_contains(self,picker):
         """Replace the contains test used by this artist. The new picker should
         be a callable function which determines whether the artist is hit by the
-        mouse event:
+        mouse event::
 
             hit, props = picker(artist, mouseevent)
 

Modified: trunk/matplotlib/setup.cfg.template
===================================================================
--- trunk/matplotlib/setup.cfg.template	2008-06-09 12:13:20 UTC (rev 5430)
+++ trunk/matplotlib/setup.cfg.template	2008-06-09 15:58:45 UTC (rev 5431)
@@ -25,7 +25,8 @@
 #pytz = False
 #dateutil = False
 #
-## Experimental config package support:
+## Experimental config package support, this should only be enabled by
+## matplotlib developers, for matplotlib development
 #enthought.traits = False
 #configobj = False
 

Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py	2008-06-09 12:13:20 UTC (rev 5430)
+++ trunk/matplotlib/setupext.py	2008-06-09 15:58:45 UTC (rev 5431)
@@ -106,7 +106,7 @@
            'provide_pytz': 'auto',
            'provide_dateutil': 'auto',
            'provide_configobj': 'auto',
-           'provide_traits': 'auto',
+           'provide_traits': False,
            'build_agg': True,
            'build_gtk': 'auto',
            'build_gtkagg': 'auto',
@@ -141,7 +141,7 @@
 
     try: options['provide_traits'] = config.getboolean("provide_packages",
                                                        "enthought.traits")
-    except: options['provide_traits'] = 'auto'
+    except: options['provide_traits'] = False
 
     try: options['build_gtk'] = config.getboolean("gui_support", "gtk")
     except: options['build_gtk'] = 'auto'
@@ -462,9 +462,11 @@
             return False
 
 def check_provide_traits():
-    if options['provide_traits'] is True:
-        print_status("enthought.traits", "matplotlib will provide")
-        return True
+    # Let's not install traits by default for now, unless it is specifically
+    # asked for in setup.cfg AND it is not already installed
+#    if options['provide_traits'] is True:
+#        print_status("enthought.traits", "matplotlib will provide")
+#        return True
     try:
         from enthought import traits
         try:
@@ -478,12 +480,16 @@
                 version = version.version
             except AttributeError:
                 version = version.__version__
-            if version.endswith('mpl'):
-                print_status("enthought.traits", "matplotlib will provide")
-                return True
-            else:
-                print_status("enthought.traits", version)
-                return False
+            # next 2 lines added temporarily while we figure out what to do
+            # with traits:
+            print_status("enthought.traits", version)
+            return False
+#            if version.endswith('mpl'):
+#                print_status("enthought.traits", "matplotlib will provide")
+#                return True
+#            else:
+#                print_status("enthought.traits", version)
+#                return False
     except ImportError:
         if options['provide_traits']:
             print_status("enthought.traits", "matplotlib will provide")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.