syncing to 0.71

jdh2358 · jdh2358 · commit 00826777be49 · 2005-01-21T22:35:15.000Z
svn path=/trunk/matplotlib/; revision=881
diff --git a/API_CHANGES b/API_CHANGES
@@ -1,7 +1,43 @@
-API CHANGES in matplotlib-0.70.2
-   
-   builtin min(), max(), round(), abs(), sum() functions no longer
-   overridden upon "from pylab import *"
+API CHANGES in matplotlib-0.71   
+
+   Significant numerix namespace changes, introduced to resolve
+   namespace clashes between python built-ins and mlab names.
+   Refactored numerix to maintain separate modules, rather than
+   folding all these names into a single namespace.  See the following
+   mailing list threads for more information and background
+
+     http://sourceforge.net/mailarchive/forum.php?thread_id=6398890&forum_id=36187
+     http://sourceforge.net/mailarchive/forum.php?thread_id=6323208&forum_id=36187
+
+
+  OLD usage
+
+   from matplotlib.numerix import array, mean, fft
+
+  NEW usage
+
+   from matplotlib.numerix import array
+   from matplotlib.numerix.mlab import mean
+   from matplotlib.numerix.fft import fft
+
+  numerix dir structure mirrors numarray (though it is an incomplete
+  implementation)
+
+    numerix
+    numerix/mlab
+    numerix/linear_algebra
+    numerix/fft
+    numerix/random_array
+
+  but of course you can use 'numerix : Numeric' and still get the
+  symbols.
+
+  pylab still imports most of the symbols from Numerix, MLab, fft,
+  etc, but is more cautious.  For names that clash with python names
+  (min, max, sum), pylab keeps the builtins and provides the numeric
+  versions with an a* prefix, eg (amin, amax, asum)
+
+
 
 API CHANGES in matplotlib-0.70
 
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,7 @@
 New entries should be added at the top
 
+2005-01-21 matplotlib-0.71 released
+
 2005-01-21 Refactored numerix to solve vexing namespace issues - JDH
 
 2005-01-21 Applied Nadia's contour bug fix - JDH
diff --git a/LICENSE/LICENSE b/LICENSE/LICENSE
@@ -1,4 +1,4 @@
-LICENSE AGREEMENT FOR MATPLOTLIB 0.70.1
+LICENSE AGREEMENT FOR MATPLOTLIB 0.71
 --------------------------------------
 
 1. This LICENSE AGREEMENT is between the John D. Hunter ("JDH"), and the
@@ -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.70.1
+derivative works, distribute, and otherwise use matplotlib 0.71
 alone or in any derivative version, provided, however, that JDH's
 License Agreement and JDH's notice of copyright, i.e., "Copyright (c)
 2002-2004 John D. Hunter; All Rights Reserved" are retained in
-matplotlib 0.70.1 alone or in any derivative version prepared by
+matplotlib 0.71 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.70.1 or any part thereof, and wants to
+incorporates matplotlib 0.71 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.70.1.
+the changes made to matplotlib 0.71.
 
-4. JDH is making matplotlib 0.70.1 available to Licensee on an "AS
+4. JDH is making matplotlib 0.71 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.70.1
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.71
 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
 
 5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF MATPLOTLIB
-0.70.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
+0.71 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
 LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
-MATPLOTLIB 0.70.1, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
+MATPLOTLIB 0.71, 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.70.1,
+8. By copying, installing or otherwise using matplotlib 0.71,
 Licensee agrees to be bound by the terms and conditions of this License
 Agreement.
diff --git a/MANIFEST b/MANIFEST
@@ -4,7 +4,6 @@ CHANGELOG
 INSTALL
 INTERACTIVE
 KNOWN_BUGS
-MANIFEST
 MANIFEST.in
 Makefile
 README
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -140,7 +140,7 @@
 Most of the other commands are from the Numeric, MLab and FFT, with
 the exception of those in mlab.py provided by matplotlib.
 """
-__version__  = '0.71rc1'
+__version__  = '0.71'
 __revision__ = '$Revision$'
 __date__     = '$Date$'
 
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -1005,6 +1005,7 @@ def contour(self, z,
         reg = ones((1,jmax*(imax+1)+1), typecode = 'i')
         reg[0,:jmax+1]=0
         reg[0,-jmax:]=0
+
         for j in range(0,jmax*(imax+1)+1, imax):
             reg[0,j]=0
 
diff --git a/lib/matplotlib/pylab.py b/lib/matplotlib/pylab.py
@@ -133,15 +133,15 @@
 
   corrcoef  - correlation coefficient
   cov       - covariance matrix
-  max       - the maximum along dimension m
+  amax       - the maximum along dimension m
   mean      - the mean along dimension m
   median    - the median along dimension m
-  min       - the minimum along dimension m
+  amin       - the minimum along dimension m
   norm      - the norm of vector x
   prod      - the product along dimension m
   ptp       - the max-min along dimension m
   std       - the standard deviation along dimension m
-  sum       - the sum along dimension m
+  asum       - the sum along dimension m
 
 _Time series analysis
 
@@ -2483,7 +2483,7 @@ def winter():
     'Line2D', 'Polygon', 'Rectangle', 'Circle', 'Text', 'cm',
     'get_cmap', 'normalize',
 
-    'show'
+    'show', 'rcParams'
     ]
 
 
