Merge remote-tracking branch 'upstream/v1.3.x'

mdboom · mdboom · commit 86d0803f646e · 2013-07-29T09:20:29.000-04:00
Conflicts:
	lib/matplotlib/__init__.py
diff --git a/distribute_setup.py b/distribute_setup.py
@@ -49,6 +49,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
+MINIMUM_VERSION = "0.6.28"
 DEFAULT_VERSION = "0.6.45"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
@@ -135,7 +136,7 @@ def _do_download(version, download_base, to_dir, download_delay):
     setuptools.bootstrap_install_from = egg
 
 
-def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
+def use_setuptools(version=MINIMUM_VERSION, download_base=DEFAULT_URL,
                    to_dir=os.curdir, download_delay=15, no_fake=True):
     # making sure we use the absolute path
     to_dir = os.path.abspath(to_dir)
diff --git a/doc/conf.py b/doc/conf.py
@@ -58,7 +58,7 @@
 
 # General substitutions.
 project = 'Matplotlib'
-copyright = '2013 John Hunter, Darren Dale, Eric Firing, Michael Droettboom and the matplotlib development team'
+copyright = '2002 - 2012 John Hunter, Darren Dale, Eric Firing, Michael Droettboom and the matplotlib development team; 2012 - 2013 The matplotlib development team'
 
 # The default replacements for |version| and |release|, also used in various
 # other places throughout the built documents.
diff --git a/doc/devel/documenting_mpl.rst b/doc/devel/documenting_mpl.rst
@@ -351,7 +351,7 @@ An example save command to generate a movie looks like this
 
     ani.save('double_pendulum.mp4', fps=15)
 
-Contact John Hunter for the login password to upload youtube videos of
+Contact Michael Droettboom for the login password to upload youtube videos of
 google docs to the mplgithub account.
 
 .. _referring-to-mpl-docs:
diff --git a/doc/make.py b/doc/make.py
@@ -236,6 +236,19 @@ def all():
 os.chdir(os.path.dirname(os.path.join(current_dir, __file__)))
 copy_if_out_of_date('../INSTALL', 'users/installing.rst')
 
+# Create the examples symlink, if it doesn't exist
+
+required_symlinks = [
+    ('mpl_examples', '../examples/'),
+    ('mpl_toolkits/axes_grid/examples', '../../../examples/axes_grid/')
+    ]
+
+for link, target in required_symlinks:
+    if not os.path.exists(link):
+        if hasattr(os, 'symlink'):
+            os.symlink(target, link)
+        else:
+            shutil.copytree(os.path.join(link, '..', target), link)
 
 if len(sys.argv)>1:
     if '--small' in sys.argv[1:]:
diff --git a/doc/users/license.rst b/doc/users/license.rst
@@ -13,10 +13,86 @@ licenses. Non-BSD compatible licenses (eg LGPL) are acceptable in
 matplotlib toolkits.  For a discussion of the motivations behind the
 licencing choice, see :ref:`license-discussion`.
 
+Copyright Policy
+================
+
+John Hunter began matplotlib around 2003.  Since shortly before his
+passing in 2012, Michael Droettboom has been the lead maintainer of
+matplotlib, but, as has always been the case, matplotlib is the work
+of many.
+
+Prior to July of 2013, and the 1.3.0 release, the copyright of the
+source code was held by John Hunter.  As of July 2013, and the 1.3.0
+release, matplotlib has moved to a shared copyright model.
+
+matplotlib uses a shared copyright model. Each contributor maintains
+copyright over their contributions to matplotlib. But, it is important to
+note that these contributions are typically only changes to the
+repositories. Thus, the matplotlib source code, in its entirety, is not
+the copyright of any single person or institution.  Instead, it is the
+collective copyright of the entire matplotlib Development Team.  If
+individual contributors want to maintain a record of what
+changes/contributions they have specific copyright on, they should
+indicate their copyright in the commit message of the change, when
+they commit the change to one of the matplotlib repositories.
+
+The Matplotlib Development Team is the set of all contributors to the
+matplotlib project.  A full list can be obtained from the git version
+control logs.
 
 License agreement for matplotlib |version|
 ==============================================
 
+1. This LICENSE AGREEMENT is between the Matplotlib Development Team
+("MDT"), and the Individual or Organization ("Licensee") accessing and
+otherwise using matplotlib software in source or binary form and its
+associated documentation.
+
+. Subject to the terms and conditions of this License Agreement, MDT
+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 |version|
+alone or in any derivative version, provided, however, that MDT's
+License Agreement and MDT's notice of copyright, i.e., "Copyright (c)
+2012-2013 Matplotlib Development Team; All Rights Reserved" are retained in
+matplotlib |version| 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 |version| 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 |version|.
+
+4. MDT is making matplotlib |version| available to Licensee on an "AS
+IS" basis.  MDT MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, MDT MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB |version|
+WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. MDT SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF MATPLOTLIB
+|version| FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
+LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
+MATPLOTLIB |version|, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
+THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+7. Nothing in this License Agreement shall be deemed to create any
+relationship of agency, partnership, or joint venture between MDT and
+Licensee.  This License Agreement does not grant permission to use MDT
+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 |version|,
+Licensee agrees to be bound by the terms and conditions of this License
+Agreement.
+
+License agreement for matplotlib versions prior to 1.3.0
+========================================================
+
 1. This LICENSE AGREEMENT is between John D. Hunter ("JDH"), and the
 Individual or Organization ("Licensee") accessing and otherwise using
 matplotlib software in source or binary form and its associated
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -718,11 +718,11 @@ def matplotlib_fname():
                 fname == os.path.join(
                     get_home(), '.matplotlib', 'matplotlibrc')):
                 warnings.warn(
-                    "Found matplotlib configuration in ~/.matplotlib. "
+                    "Found matplotlib configuration in ~/.matplotlib/. "
                     "To conform with the XDG base directory standard, "
                     "this configuration location has been deprecated "
-                    "on Linux, and the new location is now %r.  Please "
-                    "move your configuration there to ensure that "
+                    "on Linux, and the new location is now %r/matplotlib/. "
+                    "Please move your configuration there to ensure that "
                     "matplotlib will continue to find it in the future." %
                     _get_xdg_config_dir())
             return fname
diff --git a/lib/matplotlib/afm.py b/lib/matplotlib/afm.py
@@ -1,23 +1,27 @@
 """
 This is a python interface to Adobe Font Metrics Files.  Although a
-number of other python implementations exist (and may be more complete
-than mine) I decided not to go with them because either they were
-either
+number of other python implementations exist, and may be more complete
+than this, it was decided not to go with them because they were
+either:
 
   1) copyrighted or used a non-BSD compatible license
 
-  2) had too many dependencies and I wanted a free standing lib
+  2) had too many dependencies and a free standing lib was needed
 
-  3) Did more than I needed and it was easier to write my own than
-     figure out how to just get what I needed from theirs
+  3) Did more than needed and it was easier to write afresh rather than
+     figure out how to get just what was needed.
 
-It is pretty easy to use, and requires only built-in python libs::
+It is pretty easy to use, and requires only built-in python libs:
 
-    >>> from afm import AFM
-    >>> fh = open('ptmr8a.afm')
-    >>> afm = AFM(fh)
+    >>> from matplotlib import rcParams
+    >>> import os.path
+    >>> afm_fname = os.path.join(rcParams['datapath'], 
+    ...                         'fonts', 'afm', 'ptmr8a.afm')
+    >>>
+    >>> from matplotlib.afm import AFM
+    >>> afm = AFM(open(afm_fname))
     >>> afm.string_width_height('What the heck?')
-    (6220.0, 683)
+    (6220.0, 694)
     >>> afm.get_fontname()
     'Times-Roman'
     >>> afm.get_kern_dist('A', 'f')
@@ -26,12 +30,7 @@
     -92.0
     >>> afm.get_bbox_char('!')
     [130, -9, 238, 676]
-    >>> afm.get_bbox_font()
-    [-168, -218, 1000, 898]
 
-
-AUTHOR:
-  John D. Hunter <jdh2358@gmail.com>
 """
 
 from __future__ import print_function
@@ -549,14 +548,4 @@ def get_vertical_stem_width(self):
         Return the standard vertical stem width as float, or *None* if
         not specified in AFM file.
         """
-        return self._header.get(b'StdVW', None)
-
-
-if __name__ == '__main__':
-    #pathname = '/usr/local/lib/R/afm/'
-    pathname = '/usr/local/share/fonts/afms/adobe'
-
-    for fname in os.listdir(pathname):
-        with open(os.path.join(pathname, fname)) as fh:
-            afm = AFM(fh)
-            w, h = afm.string_width_height('John Hunter is the Man!')
+        return self._header.get(b'StdVW', None)
diff --git a/lib/matplotlib/backends/backend_wxagg.py b/lib/matplotlib/backends/backend_wxagg.py
@@ -1,20 +1,3 @@
-"""
-
- backend_wxagg.py
-
- A wxPython backend for Agg.  This uses the GUI widgets written by
- Jeremy O'Donoghue (jeremy@o-donoghue.com) and the Agg backend by John
- Hunter (jdhunter@ace.bsd.uchicago.edu)
-
- Copyright (C) 2003-5 Jeremy O'Donoghue, John Hunter, Illinois Institute of
- Technology
-
-
- License: This work is licensed under the matplotlib license( PSF
- compatible). A copy should be included with this source code.
-
-"""
-
 from __future__ import division, print_function
 import matplotlib
 from matplotlib.figure import Figure
@@ -26,6 +9,7 @@
     draw_if_interactive, show, Toolbar, backend_version
 import wx
 
+
 class FigureFrameWxAgg(FigureFrameWx):
     def get_canvas(self, fig):
         return FigureCanvasWxAgg(self, -1, fig)
@@ -40,6 +24,7 @@ def _get_toolbar(self, statbar):
             toolbar = None
         return toolbar
 
+
 class FigureCanvasWxAgg(FigureCanvasAgg, FigureCanvasWx):
     """
     The FigureCanvas contains the figure and does event handling.
@@ -105,6 +90,7 @@ def print_figure(self, filename, *args, **kwargs):
         if self._isDrawn:
             self.draw()
 
+
 class NavigationToolbar2WxAgg(NavigationToolbar2Wx):
     def get_canvas(self, frame, fig):
         return FigureCanvasWxAgg(frame, -1, fig)
@@ -200,5 +186,4 @@ def _WX28_clipped_agg_as_bitmap(agg, bbox):
     srcDC.SelectObject(wx.NullBitmap)
     destDC.SelectObject(wx.NullBitmap)
 
-    return destBmp
-
+    return destBmp
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -1617,7 +1617,7 @@ class Grouper(object):
         >>> grp.join(b, c)
         >>> grp.join(d, e)
         >>> sorted(map(tuple, grp))
-        [(d, e), (a, b, c)]
+        [(a, b, c), (d, e)]
         >>> grp.joined(a, b)
         True
         >>> grp.joined(a, c)
diff --git a/lib/matplotlib/offsetbox.py b/lib/matplotlib/offsetbox.py
@@ -16,6 +16,7 @@
 
 
 from __future__ import print_function
+import warnings
 import matplotlib.transforms as mtransforms
 import matplotlib.artist as martist
 import matplotlib.text as mtext
@@ -1098,6 +1099,12 @@ def __init__(self, s, loc, pad=0.4, borderpad=0.5, prop=None, **kwargs):
         other keyword parameters of AnchoredOffsetbox are also allowed.
         """
 
+        propkeys = prop.keys()
+        badkwargs = ('ha', 'horizontalalignment', 'va', 'verticalalignment')
+        if set(badkwargs) & set(propkeys):
+            warnings.warn("Mixing horizontalalignment or verticalalignment "
+                    "with AnchoredText is not supported.")
+
         self.txt = TextArea(s, textprops=prop,
                             minimumdescent=False)
         fp = self.txt._text.get_fontproperties()
diff --git a/lib/matplotlib/stackplot.py b/lib/matplotlib/stackplot.py
@@ -43,6 +43,11 @@ def stackplot(axes, x, *args, **kwargs):
     Returns *r* : A list of
     :class:`~matplotlib.collections.PolyCollection`, one for each
     element in the stacked area plot.
+
+    Note that :class:`~matplotlib.legend.Legend` does not support
+    :class:`~matplotlib.collections.PolyCollection` objects.  To create a
+    legend on a stackplot, use a proxy artist:
+    http://matplotlib.org/users/legend_guide.html#using-proxy-artist
     """
 
     if len(args) == 1:
diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py
@@ -5,6 +5,8 @@
 from matplotlib.testing.decorators import cleanup, image_comparison
 from matplotlib import pyplot as plt
 
+import re
+
 
 @cleanup
 def test_contour_shape_1d_valid():
@@ -99,14 +101,18 @@ def test_contour_shape_mismatch_4():
         ax.contour(b, g, z)
     except TypeError as exc:
         print exc.args[0]
-        assert exc.args[0] == 'Shape of x does not match that of z: ' + \
-                              'found (9, 9) instead of (9, 10).'
+        assert re.match(
+            r'Shape of x does not match that of z: ' +
+            r'found \(9L?, 9L?\) instead of \(9L?, 10L?\)\.',
+            exc.args[0]) is not None
 
     try:
         ax.contour(g, b, z)
     except TypeError as exc:
-        assert exc.args[0] == 'Shape of y does not match that of z: ' + \
-                              'found (9, 9) instead of (9, 10).'
+        assert re.match(
+            r'Shape of y does not match that of z: ' +
+            r'found \(9L?, 9L?\) instead of \(9L?, 10L?\)\.',
+            exc.args[0]) is not None
 
 
 @cleanup
@@ -159,23 +165,23 @@ def test_given_colors_levels_and_extends():
     _, axes = plt.subplots(2, 4)
 
     data = np.arange(12).reshape(3, 4)
-    
+
     colors = ['red', 'yellow', 'pink', 'blue', 'black']
     levels = [2, 4, 8, 10]
-    
+
     for i, ax in enumerate(axes.flatten()):
         plt.sca(ax)
-        
+
         filled = i % 2 == 0.
         extend = ['neither', 'min', 'max', 'both'][i // 2]
-        
+
         if filled:
             last_color = -1 if extend in ['min', 'max'] else None
             plt.contourf(data, colors=colors[:last_color], levels=levels, extend=extend)
         else:
             last_level = -1 if extend == 'both' else None
             plt.contour(data, colors=colors, levels=levels[:last_level], extend=extend)
-    
+
         plt.colorbar()
 
 
diff --git a/lib/matplotlib/tests/test_simplification.py b/lib/matplotlib/tests/test_simplification.py
@@ -152,7 +152,7 @@ def test_start_with_moveto():
     verts = np.fromstring(decodebytes(data), dtype='<i4')
     verts = verts.reshape((len(verts) / 2, 2))
     path = Path(verts)
-    segs = path.iter_segments(transforms.IdentityTransform, clip=(0.0, 0.0, 100.0, 100.0))
+    segs = path.iter_segments(transforms.IdentityTransform(), clip=(0.0, 0.0, 100.0, 100.0))
     segs = list(segs)
     assert len(segs) == 1
     assert segs[0][1] == Path.MOVETO
diff --git a/setupext.py b/setupext.py
diff --git a/src/_image.cpp b/src/_image.cpp
diff --git a/src/agg_py_transforms.cpp b/src/agg_py_transforms.cpp
diff --git a/tests.py b/tests.py
