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

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 6669
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6669&view=rev
Author:   jdh2358
Date:     2008-12-18 17:32:22 +0000 (Thu, 18 Dec 2008)

Log Message:
-----------
Merged revisions 6665-6668 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_98_5_maint

........
  r6665 | jdh2358 | 2008-12-18 08:29:51 -0800 (Thu, 18 Dec 2008) | 1 line
  
  removed some configobj and traits detritus
........
  r6666 | jdh2358 | 2008-12-18 08:31:44 -0800 (Thu, 18 Dec 2008) | 1 line
  
  tagging release 0.98.5.2
........
  r6667 | jdh2358 | 2008-12-18 09:02:41 -0800 (Thu, 18 Dec 2008) | 1 line
  
  removed mpl_data
........
  r6668 | jdh2358 | 2008-12-18 09:03:47 -0800 (Thu, 18 Dec 2008) | 1 line
  
  retagging for 98.5.2
........

Modified Paths:
--------------
    trunk/matplotlib/CHANGELOG
    trunk/matplotlib/doc/api/api_changes.rst
    trunk/matplotlib/setup.py
    trunk/matplotlib/setupext.py

Removed Paths:
-------------
    trunk/matplotlib/doc/mpl_data

Property Changed:
----------------
    trunk/matplotlib/


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6662
   + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6668

Modified: trunk/matplotlib/CHANGELOG
===================================================================

--- trunk/matplotlib/CHANGELOG	2008-12-18 17:03:47 UTC (rev 6668)
+++ trunk/matplotlib/CHANGELOG	2008-12-18 17:32:22 UTC (rev 6669)
@@ -1,5 +1,10 @@
 2008-12-18 add new arrow style, a line + filled triangles. -JJL
 
+==================================================================
+2008-12-18 Released 0.98.5.2 from v0_98_5_maint at r6667
+
+2008-12-18 Removed configobj, experimental traits and doc/mpl_data link - JDH
+
 2008-12-18 Fix bug where a line with NULL data limits prevents
            subsequent data limits from calculating correctly - MGD
 

Modified: trunk/matplotlib/doc/api/api_changes.rst
===================================================================
--- trunk/matplotlib/doc/api/api_changes.rst	2008-12-18 17:03:47 UTC (rev 6668)
+++ trunk/matplotlib/doc/api/api_changes.rst	2008-12-18 17:32:22 UTC (rev 6669)
@@ -15,6 +15,7 @@
 
 Changes for 0.98.x
 ==================
+* Removed the configobj and experiemtnal traits rc support
 
 * Modified :func:`matplotlib.mlab.psd`, :func:`matplotlib.mlab.csd`,
   :func:`matplotlib.mlab.cohere`, and :func:`matplotlib.mlab.specgram`

Deleted: trunk/matplotlib/doc/mpl_data
===================================================================
--- trunk/matplotlib/doc/mpl_data	2008-12-18 17:03:47 UTC (rev 6668)
+++ trunk/matplotlib/doc/mpl_data	2008-12-18 17:32:22 UTC (rev 6669)
@@ -1 +0,0 @@
-link ../lib/matplotlib/mpl-data/
\ No newline at end of file

Modified: trunk/matplotlib/setup.py
===================================================================
--- trunk/matplotlib/setup.py	2008-12-18 17:03:47 UTC (rev 6668)
+++ trunk/matplotlib/setup.py	2008-12-18 17:32:22 UTC (rev 6669)
@@ -35,12 +35,12 @@
 from distutils.core import setup
 from setupext import build_agg, build_gtkagg, build_tkagg, build_wxagg,\
      build_macosx, build_ft2font, build_image, build_windowing, build_path, \
-     build_contour, build_delaunay, build_nxutils, build_traits, build_gdk, \
+     build_contour, build_delaunay, build_nxutils, build_gdk, \
      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_macosx, check_for_numpy, \
-     check_for_qt, check_for_qt4, check_for_cairo, check_for_traits, \
-     check_provide_pytz, check_provide_dateutil, check_for_configobj, \
+     check_for_qt, check_for_qt4, check_for_cairo, \
+     check_provide_pytz, check_provide_dateutil,\
      check_for_dvipng, check_for_ghostscript, check_for_latex, \
      check_for_pdftops, check_for_datetime, options, build_png
 #import distutils.sysconfig
@@ -217,15 +217,7 @@
 check_for_latex()
 check_for_pdftops()
 
-# TODO: comment out for mpl release:
 print_raw("")
-print_raw("EXPERIMENTAL CONFIG PACKAGE DEPENDENCIES")
-has_configobj = check_for_configobj()
-has_traits = check_for_traits()
-if has_configobj and has_traits:
-    packages.append('matplotlib.config')
-
-print_raw("")
 print_raw("[Edit setup.cfg to suppress the above messages]")
 print_line()
 

Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py	2008-12-18 17:03:47 UTC (rev 6668)
+++ trunk/matplotlib/setupext.py	2008-12-18 17:32:22 UTC (rev 6669)
@@ -83,7 +83,6 @@
 BUILT_CONTOUR   = False
 BUILT_DELAUNAY  = False
 BUILT_NXUTILS   = False
-BUILT_TRAITS    = False
 BUILT_CONTOUR   = False
 BUILT_GDK       = False
 BUILT_PATH      = False
@@ -434,36 +433,6 @@
             print_status("dateutil", "present, version unknown")
             return False
 
-def check_for_configobj():
-    try:
-        import configobj
-    except ImportError:
-        print_status("configobj", "no")
-        return False
-    else:
-        print_status("configobj", configobj.__version__)
-        return True
-
-def check_for_traits():
-    try:
-        from enthought import traits
-        try:
-            from enthought.traits import version
-        except:
-            print_status("enthought.traits", "unknown and incompatible version: < 2.0")
-            return False
-        else:
-            # traits 2 and 3 store their version strings in different places:
-            try:
-                version = version.version
-            except AttributeError:
-                version = version.__version__
-            print_status("enthought.traits", version)
-            return True
-    except ImportError:
-        print_status("enthought.traits", "no")
-        return False
-
 def check_for_dvipng():
     try:
         stdin, stdout = run_child_process('dvipng -version')
@@ -1316,24 +1285,7 @@
     BUILT_IMAGE = 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(['enthought',
-                     'enthought/etsconfig',
-                     'enthought/traits',
-                     'enthought/traits/ui',
-                     'enthought/traits/ui/extras',
-                     'enthought/traits/ui/null',
-                     'enthought/traits/ui/tk',
-                     ])
-    BUILT_TRAITS = True
-
 def build_delaunay(ext_modules, packages):
     global BUILT_DELAUNAY
     if BUILT_DELAUNAY:


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


