synching to 0.51

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

LICENSE

@@ -1,4 +1,4 @@
-LICENSE AGREEMENT FOR MATPLOTLIB 0.50
+LICENSE AGREEMENT FOR MATPLOTLIB 0.51
 --------------------------------------
 
 1. This LICENSE AGREEMENT is between the John D. Hunter ("JDH"), and
@@ -9,30 +9,30 @@ documentation.
 2. Subject to the terms and conditions of this License Agreement, JDH
 hereby grants Licensee a nonexclusive, royalty-free, world-wide
 license to reproduce, analyze, test, perform and/or display publicly,
-prepare derivative works, distribute, and otherwise use matplotlib 0.50
+prepare derivative works, distribute, and otherwise use matplotlib 0.51
 alone or in any derivative version, provided, however, that JDH's
 License Agreement and JDH's notice of copyright, i.e., "Copyright (c)
 2002, 2003 John D. Hunter; All Rights Reserved" are retained in
-matplotlib 0.50 alone or in any derivative version prepared by
+matplotlib 0.51 alone or in any derivative version prepared by
 Licensee.
 
 3. In the event Licensee prepares a derivative work that is based on
-or incorporates matplotlib 0.50 or any part thereof, and wants to make
+or incorporates matplotlib 0.51 or any part thereof, and wants to make
 the derivative work available to others as provided herein, then
 Licensee hereby agrees to include in any such work a brief summary of
-the changes made to matplotlib 0.50.
+the changes made to matplotlib 0.51.
 
-4. JDH is making matplotlib 0.50 available to Licensee on an "AS IS"
+4. JDH is making matplotlib 0.51 available to Licensee on an "AS IS"
 basis.  JDH MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
 IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, JDH MAKES NO AND
 DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.50 WILL NOT
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.51 WILL NOT
 INFRINGE ANY THIRD PARTY RIGHTS.
 
 5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF
-MATPLOTLIB 0.50 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES
+MATPLOTLIB 0.51 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES
 OR LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
-MATPLOTLIB 0.50, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE
+MATPLOTLIB 0.51, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE
 POSSIBILITY THEREOF.
 
 6. This License Agreement will automatically terminate upon a material
@@ -44,6 +44,6 @@ Licensee.  This License Agreement does not grant permission to use JDH
 trademarks or trade name in a trademark sense to endorse or promote
 products or services of Licensee, or any third party.
 
-8. By copying, installing or otherwise using matplotlib 0.50, Licensee
+8. By copying, installing or otherwise using matplotlib 0.51, Licensee
 agrees to be bound by the terms and conditions of this License
 Agreement.

MANIFEST

@@ -8,7 +8,6 @@ INTERACTIVE
 KNOWN_BUGS
 LICENSE
 LICENSE_PAINT
-MANIFEST
 MANIFEST.in
 Makefile
 README

examples/alignment_test.py

@@ -82,5 +82,5 @@
         transy=ax.yaxis.transAxis)
 
 axis('off')
-savefig('alignment_test', dpi=300)
+#savefig('alignment_test', dpi=300)
 show()

examples/arctest.py

@@ -11,6 +11,6 @@ def f(t):
 l = plot(t1, f(t1), 'ro')
 set(l, 'markersize', 30)
 set(l, 'markerfacecolor', 'b')
-savefig('arctest', dpi=150)
+#savefig('arctest', dpi=150)
 show()
 

examples/backend_driver.py

@@ -24,6 +24,7 @@
     'line_styles.py',
     'log_demo.py',
     'log_test.py',
+    'mathtext_demo.py',
     'mri_with_eeg.py',
     'multiple_figs_demo.py',
     'pcolor_demo.py',
@@ -65,7 +66,7 @@ def drive(backend):
 times = {}
 backends = ['PS', 'GD', 'Paint', 'Agg', 'Template']
 #backends.extend([ 'GTK', 'WX', 'TkAgg'])
-backends = [ 'Agg']
+#backends = [ 'Agg']
 
 for backend in backends:
     print 'testing %s' % backend

examples/ftface_props.py

@@ -6,7 +6,8 @@
 """
 from matplotlib.ft2font import FT2Font
 
-fname = '/usr/local/share/matplotlib/VeraIt.ttf'
+#fname = '/usr/local/share/matplotlib/VeraIt.ttf'
+fname = '/usr/local/share/matplotlib/cmr10.ttf'
 
 font = FT2Font(fname)
 

examples/histogram_demo.py

@@ -13,6 +13,7 @@
 
 xlabel('Smarts')
 ylabel('Probability')
+#title(r'$\rm{Histogram of IQ:} \mu=100, \sigma=15$')
 title('Histogram of IQ: mu=100, sigma=15')
 #savefig('histogram_demo',dpi=72)
 show()

examples/mathtext_demo.py

@@ -20,5 +20,5 @@
 #tex = r'$\alpha\beta\gamma$'
 text(1, 2.6, tex, fontsize=20)
 title(r'$\Delta_i \rm{versus} \Delta_{i+1}$', fontsize=15)
-savefig('mathtext_demo', dpi=100)
+#savefig('mathtext_demo', dpi=100)
 show()

examples/scatter_demo2.py

@@ -16,7 +16,7 @@
 ylabel(r'$\Delta_{i+1}$', fontsize=20)
 title(r'Volume and percent change')
 grid(True)
-savefig('scatter_demo2')
+#savefig('scatter_demo2')
 show()
 
 

setup.py

@@ -5,31 +5,31 @@
 
 # build the freetype2 interface - this is required for mathtext
 # Requires freetype2, and libz
-BUILD_FT2FONT = 1
+BUILD_FT2FONT = 0
 
 # Build the fonttools and TTFQuery packages, required by the Paint,
 # Agg and GD backends.
-BUILD_FONTTOOLS = 1
+BUILD_FONTTOOLS = 0
 
 # Build the antigrain geometry toolkit.  Agg makes heavy use of
 # templates, so it probably requires a fairly recent compiler to build
 # it.  It makes very nice antialiased output and also supports alpha
 # blending
-BUILD_AGG = 1
+BUILD_AGG = 0
 
 # The builds below are alpha.  They use an image backend (eg GD or
 # Agg) to render to the GTK canvas.  The idea is to could use a single
 # high quality image renderer to render to all the GUI windows
 
 # build GTK GUI with Agg renderer ; requires pygtk src distros installed
-BUILD_GTKAGG       = 1
+BUILD_GTKAGG       = 0
 
 # build GTK GUI with GD renderer ; requires pygtk and GD src distros installed
 BUILD_GTKGD        = 0
 
 # build TK GUI with Agg renderer ; requires Tkinter Python extension
 # and Tk includes
-BUILD_TKAGG        = 1
+BUILD_TKAGG        = 0
 
 ## You shouldn't need to customize below this point
 
@@ -91,7 +91,7 @@
 
 
 setup(name="matplotlib",
-      version= '0.51h',
+      version= '0.51',
       description = "Matlab style python plotting package",
       author = "John D. Hunter",
       author_email="jdhunter@ace.bsd.uchicago.edu",

setupext.py

@@ -46,12 +46,10 @@
     See for details http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&oe=UTF-8&threadm=mailman.1060311735.32666.python-list%40python.org&rnum=1&prev=/groups%3Fhl%3Den%26lr%3D%26ie%3DUTF-8%26oe%3DUTF-8%26q%3Dpython%2B%2522extensions%2Bneed%2Bto%2Bbe%2Bbuilt%2Bwith%2Bthe%2Bsame%2Bversion%2Bof%2Bthe%2Bcompiler%2522 
 
 
-    Current problems:
-
-    c:\mingw\bin\dllwrap.exe -mno-cygwin -mdll -static --entry _DllMain@12 --output-lib build\temp.win32-2.2\Release\lib_tkagg.a --def build\temp.win32-2.2\Release\_tkagg.def -s build\temp.win32-2.2\Release\_tkagg.o -LC:/Python23/dlls -Lwin32_static -LC:\PYTHON22\libs -ltk84 -ltcl84 -lfreetype -lpng -lz -lgw32c -lstdc++ -lm -lpython22 -o build\lib.win32-2.2\matplotlib\backends\_tkagg.pyd
-    error: command 'dllwrap' failed with exit status 1
-
-    ideas: libstdc++ or libpython22 need to be moved up in link order?
+    Note building for python22.  Delete c:\python22\lib\distutils and copy
+    the (patched) python23 version into this folder.  Delete all the
+    *.pyc in c:\python22\lib\distutils and the command subdir.  Should work
+    
     
 """
 import sys, os