|
From: <ds...@us...> - 2008-06-09 20:07:22
|
Revision: 5442
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5442&view=rev
Author: dsdale
Date: 2008-06-09 13:07:15 -0700 (Mon, 09 Jun 2008)
Log Message:
-----------
don't install traits
Modified Paths:
--------------
branches/v0_91_maint/setup.cfg.template
branches/v0_91_maint/setupext.py
Modified: branches/v0_91_maint/setup.cfg.template
===================================================================
--- branches/v0_91_maint/setup.cfg.template 2008-06-09 19:58:46 UTC (rev 5441)
+++ branches/v0_91_maint/setup.cfg.template 2008-06-09 20:07:15 UTC (rev 5442)
@@ -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: branches/v0_91_maint/setupext.py
===================================================================
--- branches/v0_91_maint/setupext.py 2008-06-09 19:58:46 UTC (rev 5441)
+++ branches/v0_91_maint/setupext.py 2008-06-09 20:07:15 UTC (rev 5442)
@@ -105,7 +105,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',
@@ -140,7 +140,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'
@@ -461,9 +461,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:
@@ -477,12 +479,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.
|