sync to 0.53

svn path=/trunk/matplotlib/; revision=250

Author: jdh2358

.matplotlibrc

@@ -1,9 +1,13 @@
 #### MATPLOTLIBRC FORMAT 
-# This is a sample matplotlib configuration file
-# It should be placed in your home dir (Linux and friends) or
-# in the matplotlib data path, is, where matplotlib installs it's
-# data files (fonts, etc).  On windows, this would be, for example,
-# C:\Python23\share\matplotlib
+#
+# This is a sample matplotlib configuration file It should be placed
+# in your home dir (Linux and friends) or in the matplotlib data path,
+# is, where matplotlib installs it's data files (fonts, etc).  On
+# windows, this would be, for example, C:\Python23\share\matplotlib
+#
+# By default, the installer will overwrite the existing file in the
+# install path, so if you want to preserve your's, please move it to
+# your HOME dir and set the environment variable if necessary.
 #
 # This file is best viewed in a editor which supports python mode
 # syntax highlighting

CHANGELOG

@@ -1,6 +1,11 @@
 New entries should be added at the top
 
-2004-04-19 - Fixed vertical alignment bug in PS backend - JDH
+
+
+------------------------------------------------------------
+2004-04-21 matplotlib 0.53 release
+
+2004-04-19 Fixed vertical alignment bug in PS backend - JDH
 
 2004-04-17 Added support for two scales on the "same axes" with tick
            different ticking and labeling left right or top bottom.

MANIFEST

@@ -5,13 +5,11 @@ GOALS
 INSTALL
 INTERACTIVE
 KNOWN_BUGS
-MANIFEST
 MANIFEST.in
 Makefile
 README
 TODO
 __init__.py
-postinstall.py
 setup.py
 setupext.py
 agg2/gpc/gpc.h

Makefile

@@ -2,6 +2,9 @@
 # Copyright (C) 2003  <jdhunter@ace.bsd.uchicago.edu>
 # $Header$
 # $Log$
+# Revision 1.29  2004/04/21 15:28:55  jdh2358
+# sync to 0.53
+#
 # Revision 1.28  2004/04/20 22:53:37  jdh2358
 # removed tz info from dates; updated htdocs
 #
@@ -102,7 +105,7 @@ clean:
 	find . -name "_tmp*.py" | xargs rm -f;\
 	find . \( -name "*~" -o -name "*.pyc" \) | xargs rm -f;\
 	find examples \( -name "*.png" -o -name "*.ps"  -o -name "*.jpg" -o -name "*.eps" \) | xargs rm -f
-	find . \( -name "#*" -o -name ".#*" -o -name ".*~" -o -name "*~"\) | xargs rm -f
+	find . \( -name "#*" -o -name ".#*" -o -name ".*~" -o -name "*~" \) | xargs rm -f
 
 
 release: ${DISTFILES}

TODO

@@ -319,4 +319,8 @@
 
 -- DONE modify pcolor to allow custom cmap
 
--- Check for empty quote data returns
+-- Check for empty quote data returns
+
+-- toolbar not showing up in wx os x
+
+-- fromstring examples need byte order in darwin

setup.py

@@ -1,6 +1,9 @@
 """
 matplotlib has added some extension module code which can optionally
 be built by setting the appropriate flag below.
+
+The GTKAgg and TkAgg will try to build if they detect pygtk or Tkinter
+respectively; set them to 0 if you do not want to build them
 """
 
 # build the freetype2 interface - this is required for mathtext
@@ -27,14 +30,16 @@
 # high quality image renderer to render to all the GUI windows
 
 # build GTK GUI with Agg renderer ; requires pygtk src distros installed
-BUILD_GTKAGG       = 0
+# Use False or 0 if you don't want to build
+BUILD_GTKAGG       = 'auto'
 
 # build TK GUI with Agg renderer ; requires Tkinter Python extension
 # and Tk includes
-BUILD_TKAGG        = 0
+# Use False or 0 if you don't want to build
+BUILD_TKAGG        = 'auto'
 
 # build a small extension to manage the focus on win32 platforms.
-BUILD_WINDOWING        = 0
+BUILD_WINDOWING        = 'auto'
 
 ## You shouldn't need to customize below this point
 
@@ -51,8 +56,7 @@
 data.extend(glob.glob('fonts/ttf/*.ttf'))
 data.extend(glob.glob('images/*.xpm'))
 data.extend(glob.glob('images/*.ppm'))
-if sys.platform != 'win32': # win32 uses postinstaller for conditional install
-    data.append('.matplotlibrc')
+data.append('.matplotlibrc')
 
 data_files=[('share/matplotlib', data),]
 
@@ -64,12 +68,20 @@
 
 
 if BUILD_GTKAGG:
-    BUILD_AGG = 1
-    build_gtkagg(ext_modules, packages)
+    
+    try: import gtk
+    except ImportError: print 'GTKAgg requires pygtk'
+    else:
+        BUILD_AGG = 1
+        build_gtkagg(ext_modules, packages)
 
 if BUILD_TKAGG:
-    BUILD_AGG = 1
-    build_tkagg(ext_modules, packages)
+    try: import Tkinter
+    except ImportError: print 'GTKAgg requires pygtk'
+    else:
+        BUILD_AGG = 1
+        build_tkagg(ext_modules, packages)
+
 
 if BUILD_AGG:
     BUILD_FT2FONT = 1
@@ -78,7 +90,7 @@
 if BUILD_FT2FONT:
     build_ft2font(ext_modules, packages)
 
-if BUILD_WINDOWING:
+if BUILD_WINDOWING and sys.platform=='win32':
    build_windowing(ext_modules, packages)
 
 if BUILD_IMAGE:
@@ -100,5 +112,4 @@
       platforms='any',
       ext_modules = ext_modules, 
       data_files = data_files,
-      scripts=['postinstall.py'],
       )

setupext.py

@@ -25,7 +25,7 @@
   http://matplotlib.sourceforge.net/win32_static.tar.gz and
   see the README file in that dir
 
-  > python setup.py build --compiler=mingw32 bdist_wininst --install-script postinstall.py > build23.out
+  > python setup.py build --compiler=mingw32 bdist_wininst  > build23.out
 
 """
 
@@ -61,8 +61,10 @@
 
 
 def add_base_flags(module):
-    incdirs = [os.path.join(p, 'include') for p in basedir[sys.platform]]
-    libdirs = [os.path.join(p, 'lib')     for p in basedir[sys.platform]]
+    incdirs = [os.path.join(p, 'include') for p in basedir[sys.platform]
+               if os.path.exists(p)]
+    libdirs = [os.path.join(p, 'lib')     for p in basedir[sys.platform]
+               if os.path.exists(p)]
     module.include_dirs.extend(incdirs)
     module.library_dirs.extend(libdirs)
 
@@ -99,10 +101,11 @@ def add_ft2font_flags(module):
     for d in basedirs:
         module.include_dirs.append(os.path.join(d, 'freetype2'))
         if sys.platform == 'darwin':
-            module.include_dirs.append(
-                os.path.join(d, 'lib/freetype2/include'))
-            module.include_dirs.append(
-                os.path.join(d, 'lib/freetype2/include/freetype2'))
+            p = os.path.join(d, 'lib/freetype2/include')
+            if os.path.exists(p): module.include_dirs.append(p)
+            p = os.path.join(d, 'lib/freetype2/include/freetype2')
+            if os.path.exists(p): module.include_dirs.append(p)
+                
 
 
     if sys.platform == 'win32':