move configobj.py to lib/, install in site-packages only if required

ddale · ddale · commit 93733c25ceb1 · 2007-11-08T00:09:17.000Z
svn path=/trunk/matplotlib/; revision=4155
diff --git a/examples/rc_traits.py b/examples/rc_traits.py
@@ -7,7 +7,7 @@
 # below.
 
 import sys, os, re
-import matplotlib.enthought.traits as traits
+import matplotlib.enthought.traits.api as traits
 from matplotlib.cbook import is_string_like
 from matplotlib.artist import Artist
 
diff --git a/lib/configobj.py b/lib/configobj.py
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -55,15 +55,20 @@
 """
 from __future__ import generators
 
-NEWCONFIG = False
-
 __version__  = '0.90.1'
 __revision__ = '$Revision$'
 __date__     = '$Date$'
 
 import md5, os, re, shutil, sys, warnings
 import distutils.sysconfig
 
+
+NEWCONFIG = True
+# TODO: remove this when we stop shipping 
+# enthought.traits as an internal package:
+#sys.path.append(os.path.split(__file__)[0])
+
+
 # Needed for toolkit setuptools support
 if 0:
     try:
diff --git a/setup.py b/setup.py
@@ -78,10 +78,11 @@
 from distutils.core import setup
 from setupext import build_agg, build_gtkagg, build_tkagg, build_wxagg,\
      build_ft2font, build_image, build_windowing, build_transforms, \
-     build_contour, build_nxutils, build_enthought, build_swigagg, build_gdk, \
+     build_contour, build_nxutils, build_traits, build_swigagg, build_gdk, \
      build_subprocess, build_ttconv, print_line, print_status, print_message, \
      print_raw, check_for_freetype, check_for_libpng, check_for_gtk, check_for_tk, \
-     check_for_wx, check_for_numpy, check_for_qt, check_for_qt4, check_for_cairo
+     check_for_wx, check_for_numpy, check_for_qt, check_for_qt4, check_for_cairo, \
+     check_for_traits
 #import distutils.sysconfig
 
 # jdh
@@ -99,6 +100,8 @@
     'matplotlib.config'
     ]
 
+py_modules = ['pylab']
+
 ext_modules = []
 
 # these are not optional
@@ -218,7 +221,12 @@ def add_dateutil():
 
 build_swigagg(ext_modules, packages)
 build_transforms(ext_modules, packages)
-build_enthought(ext_modules, packages)
+
+# for the traited config package:
+try: import configobj
+except ImportError: py_modules.append('configobj')
+
+if not check_for_traits(): build_traits(ext_modules, packages)
 
 if check_for_gtk() and (BUILD_GTK or BUILD_GTKAGG):
     if BUILD_GTK:
@@ -295,7 +303,7 @@ def add_dateutil():
       """,
       packages = packages,
       platforms='any',
-      py_modules = ['pylab'],
+      py_modules = py_modules,
       ext_modules = ext_modules,
       package_dir = {'': 'lib'},
       package_data = package_data,
diff --git a/setupext.py b/setupext.py
@@ -87,7 +87,7 @@
 BUILT_WINDOWING = False
 BUILT_CONTOUR   = False
 BUILT_NXUTILS   = False
-BUILT_ENTHOUGHT = False
+BUILT_TRAITS = False
 BUILT_CONTOUR   = False
 BUILT_GDK       = False
 
@@ -324,6 +324,23 @@ def check_for_cairo():
     else:
         print_status("Cairo", cairo.version)
 
+def check_for_traits():
+    gotit = False
+    try:
+        from enthought import traits
+        gotit = True
+        try:
+            from enthought.traits import version
+        except:
+            print_status("enthought.traits", "unknown and incompatible version: < 2.0")
+            return gotit
+        else:
+            if version.version.endswith('mpl'): gotit = False
+            print_status("enthought.traits", version.version)
+    except ImportError:
+        print_status("enthought.traits", "no")
+    return gotit
+
 def check_for_numpy():
     gotit = False
     try:
@@ -965,20 +982,41 @@ def build_transforms(ext_modules, packages):
     add_base_flags(module)
     ext_modules.append(module)
 
-def build_enthought(ext_modules, packages):
-    global BUILT_ENTHOUGHT
-    if BUILT_ENTHOUGHT: return # only build it if you you haven't already
-
-    ctraits = Extension('matplotlib.enthought.traits.ctraits',  ['lib/matplotlib/enthought/traits/ctraits.c'])
+#def build_enthought(ext_modules, packages):
+#    global BUILT_ENTHOUGHT
+#    if BUILT_ENTHOUGHT: return # only build it if you you haven't already
+#
+#    ctraits = Extension('matplotlib.enthought.traits.ctraits',  ['lib/matplotlib/enthought/traits/ctraits.c'])
+#    ext_modules.append(ctraits)
+#    packages.extend(['matplotlib/enthought',
+#                     'matplotlib/enthought/traits',
+#                     'matplotlib/enthought/traits/ui',
+#                     'matplotlib/enthought/traits/ui/null',
+#                     'matplotlib/enthought/resource',
+#                     'matplotlib/enthought/util',
+#                     ])
+#    BUILT_ENTHOUGHT = True
+
+def build_traits(ext_modules, packages):
+    global BUILT_TRAITS
+    if BUILT_TRAITS:
+        return # only build it if you you haven't already
+
+    ctraits = Extension('enthought.traits.ctraits',
+                        ['lib/enthought/traits/ctraits.c'])
     ext_modules.append(ctraits)
-    packages.extend(['matplotlib/enthought',
-                     'matplotlib/enthought/traits',
-                     'matplotlib/enthought/traits/ui',
-                     'matplotlib/enthought/traits/ui/null',
-                     'matplotlib/enthought/resource',
-                     'matplotlib/enthought/util',
+    packages.extend(['enthought',
+                     'enthought/etsconfig',
+                     'enthought/traits',
+#                     'enthought/traits/plugins',
+                     'enthought/traits/ui',
+                     'enthought/traits/ui/extras',
+                     'enthought/traits/ui/null',
+#                     'enthought/traits/ui/tests',
+                     'enthought/traits/ui/tk',
                      ])
-    BUILT_ENTHOUGHT = True
+    BUILT_TRAITS = True
+
 
 def build_contour(ext_modules, packages):
     global BUILT_CONTOUR
