Merge remote-tracking branch 'matplotlib/v2.x'

tacaswell · tacaswell · commit 3cd9c2d56282 · 2016-03-28T15:40:11.000-04:00
Conflicts:
	lib/matplotlib/backends/backend_macosx.py
	   Resolve in favor of head (which lead to no net change)
        lib/matplotlib/tests/test_axes.py
           Keep warning import
diff --git a/examples/shapes_and_collections/artist_reference.py b/examples/shapes_and_collections/artist_reference.py
@@ -84,7 +84,7 @@ def label(xy, text):
     grid[7] - [0.025, 0.05], 0.05, 0.1,
     boxstyle=mpatches.BoxStyle("Round", pad=0.02))
 patches.append(fancybox)
-label(grid[7], "FancyBoxPatch")
+label(grid[7], "FancyBboxPatch")
 
 # add a line
 x, y = np.array([[-0.06, 0.0, 0.1], [0.05, -0.05, 0.05]])
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -137,6 +137,21 @@
 
 __version__numpy__ = str('1.6')  # minimum required numpy version
 
+__bibtex__ = """@Article{Hunter:2007,
+  Author    = {Hunter, J. D.},
+  Title     = {Matplotlib: A 2D graphics environment},
+  Journal   = {Computing In Science \& Engineering},
+  Volume    = {9},
+  Number    = {3},
+  Pages     = {90--95},
+  abstract  = {Matplotlib is a 2D graphics package used for Python
+  for application development, interactive scripting, and
+  publication-quality image generation across user
+  interfaces and operating systems.},
+  publisher = {IEEE COMPUTER SOC},
+  year      = 2007
+}"""
+
 try:
     import dateutil
 except ImportError:
@@ -554,16 +569,14 @@ def _create_tmp_config_dir():
         # Some restricted platforms (such as Google App Engine) do not provide
         # gettempdir.
         return None
-
     try:
         username = getpass.getuser()
     except KeyError:
         username = str(os.getuid())
-    tempdir = os.path.join(tempdir, 'matplotlib-%s' % username)
 
-    os.environ['MPLCONFIGDIR'] = tempdir
+    tempdir = tempfile.mkdtemp(prefix='matplotlib-%s-' % username, dir=tempdir)
 
-    mkdirs(tempdir)
+    os.environ['MPLCONFIGDIR'] = tempdir
 
     return tempdir
 
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -2078,7 +2078,7 @@ def _get_output_canvas(self, format):
                          'Supported formats: '
                          '%s.' % (format, ', '.join(formats)))
 
-    def print_figure(self, filename, dpi=None, facecolor='w', edgecolor='w',
+    def print_figure(self, filename, dpi=None, facecolor=None, edgecolor=None,
                      orientation='portrait', format=None, **kwargs):
         """
         Render the figure to hardcopy. Set the figure patch face and edge
@@ -2098,10 +2098,10 @@ def print_figure(self, filename, dpi=None, facecolor='w', edgecolor='w',
             the dots per inch to save the figure in; if None, use savefig.dpi
 
         *facecolor*
-            the facecolor of the figure
+            the facecolor of the figure; if None, defaults to savefig.facecolor
 
         *edgecolor*
-            the edgecolor of the figure
+            the edgecolor of the figure; if None, defaults to savefig.edgecolor
 
         *orientation*
             landscape' | 'portrait' (not supported on all backends)
@@ -2141,9 +2141,15 @@ def print_figure(self, filename, dpi=None, facecolor='w', edgecolor='w',
 
         if dpi is None:
             dpi = rcParams['savefig.dpi']
+
         if dpi == 'figure':
             dpi = self.figure.dpi
 
+        if facecolor is None:
+            facecolor = rcParams['savefig.facecolor']
+        if edgecolor is None:
+            edgecolor = rcParams['savefig.edgecolor']
+
         origDPI = self.figure.dpi
         origfacecolor = self.figure.get_facecolor()
         origedgecolor = self.figure.get_edgecolor()
diff --git a/lib/matplotlib/backends/backend_cocoaagg.py b/lib/matplotlib/backends/backend_cocoaagg.py
@@ -178,7 +178,7 @@ def updatePlot(self):
     def windowDidResize_(self, sender):
         w,h = self.bounds().size
         dpi = self.canvas.figure.dpi
-        self.canvas.figure.set_size_inches(w / dpi, h / dpi)
+        self.canvas.figure.set_size_inches(w / dpi, h / dpi, forward=False)
         self.canvas.draw()
         self.updatePlot()
 
diff --git a/lib/matplotlib/backends/backend_gtk.py b/lib/matplotlib/backends/backend_gtk.py
@@ -355,7 +355,7 @@ def configure_event(self, widget, event):
 
         # resize the figure (in inches)
         dpi = self.figure.dpi
-        self.figure.set_size_inches (w/dpi, h/dpi)
+        self.figure.set_size_inches(w/dpi, h/dpi, forward=False)
         self._need_redraw = True
 
         return False  # finish event propagation?
diff --git a/lib/matplotlib/backends/backend_gtk3.py b/lib/matplotlib/backends/backend_gtk3.py
@@ -285,7 +285,7 @@ def size_allocate(self, widget, allocation):
         dpival = self.figure.dpi
         winch = allocation.width / dpival
         hinch = allocation.height / dpival
-        self.figure.set_size_inches(winch, hinch)
+        self.figure.set_size_inches(winch, hinch, forward=False)
         FigureCanvasBase.resize_event(self)
         self.draw_idle()
 
@@ -318,7 +318,7 @@ def configure_event(self, widget, event):
 
         # resize the figure (in inches)
         dpi = self.figure.dpi
-        self.figure.set_size_inches (w/dpi, h/dpi)
+        self.figure.set_size_inches(w/dpi, h/dpi, forward=False)
         self._need_redraw = True
 
         return False  # finish event propagation?
diff --git a/lib/matplotlib/backends/backend_gtkagg.py b/lib/matplotlib/backends/backend_gtkagg.py
@@ -76,7 +76,7 @@ def configure_event(self, widget, event=None):
         dpival = self.figure.dpi
         winch = w/dpival
         hinch = h/dpival
-        self.figure.set_size_inches(winch, hinch)
+        self.figure.set_size_inches(winch, hinch, forward=False)
         self._need_redraw = True
         self.resize_event()
         if DEBUG: print('FigureCanvasGTKAgg.configure_event end')
diff --git a/lib/matplotlib/backends/backend_qt5.py b/lib/matplotlib/backends/backend_qt5.py
@@ -331,7 +331,7 @@ def resizeEvent(self, event):
         dpival = self.figure.dpi
         winch = w / dpival
         hinch = h / dpival
-        self.figure.set_size_inches(winch, hinch)
+        self.figure.set_size_inches(winch, hinch, forward=False)
         FigureCanvasBase.resize_event(self)
         self.draw_idle()
         QtWidgets.QWidget.resizeEvent(self, event)
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
@@ -272,7 +272,7 @@ def resize(self, event):
         dpival = self.figure.dpi
         winch = width/dpival
         hinch = height/dpival
-        self.figure.set_size_inches(winch, hinch)
+        self.figure.set_size_inches(winch, hinch, forward=False)
 
 
         self._tkcanvas.delete(self._tkphoto)
diff --git a/lib/matplotlib/backends/backend_webagg_core.py b/lib/matplotlib/backends/backend_webagg_core.py
@@ -350,7 +350,7 @@ def handle_resize(self, event):
         x, y = int(x) * self._dpi_ratio, int(y) * self._dpi_ratio
         fig = self.figure
         # An attempt at approximating the figure size in pixels.
-        fig.set_size_inches(x / fig.dpi, y / fig.dpi)
+        fig.set_size_inches(x / fig.dpi, y / fig.dpi, forward=False)
 
         _, _, w, h = self.figure.bbox.bounds
         # Acknowledge the resize, and force the viewer to update the
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -983,7 +983,7 @@ def _onSize(self, evt):
         dpival = self.figure.dpi
         winch = self._width / dpival
         hinch = self._height / dpival
-        self.figure.set_size_inches(winch, hinch)
+        self.figure.set_size_inches(winch, hinch, forward=False)
 
         # Rendering will happen on the associated paint event
         # so no need to do anything here except to make sure
diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py
@@ -831,7 +831,7 @@ def tick_values(self, vmin, vmax):
             # The magic number!
             stop = _from_ordinalf(3652059.9999999)
 
-        self.rule.set(dtstart=start, until=stop, count=self.MAXTICKS + 1)
+        self.rule.set(dtstart=start, until=stop)
 
         # estimate the number of ticks very approximately so we don't
         # have to do a very expensive (and potentially near infinite)
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -668,7 +668,7 @@ def figimage(self, X,
         self.stale = True
         return im
 
-    def set_size_inches(self, w, h=None, forward=False):
+    def set_size_inches(self, w, h=None, forward=True):
         """
         set_size_inches(w,h, forward=False)
 
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -1879,7 +1879,7 @@ def register(klass, name, style):
 class BoxStyle(_Style):
     """
     :class:`BoxStyle` is a container class which defines several
-    boxstyle classes, which are used for :class:`FancyBoxPatch`.
+    boxstyle classes, which are used for :class:`FancyBboxPatch`.
 
     A style object can be created as::
 
diff --git a/lib/matplotlib/testing/compare.py b/lib/matplotlib/testing/compare.py
@@ -242,6 +242,11 @@ def crop_to_same(actual_path, actual_image, expected_path, expected_image):
 
 def calculate_rms(expectedImage, actualImage):
     "Calculate the per-pixel errors, then compute the root mean square error."
+    if expectedImage.shape != actualImage.shape:
+        raise ImageComparisonFailure(
+            "image sizes do not match expected size: {0} "
+            "actual size {1}".format(expectedImage.shape, actualImage.shape))
+
     num_values = np.prod(expectedImage.shape)
     abs_diff_image = abs(expectedImage - actualImage)
 
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -25,6 +25,7 @@
 import matplotlib.pyplot as plt
 import matplotlib.markers as mmarkers
 from numpy.testing import assert_allclose, assert_array_equal
+import warnings
 from matplotlib.cbook import IgnoredKeywordWarning
 
 import sys
@@ -1794,11 +1795,11 @@ def test_boxplot_sym():
 def test_boxplot_autorange_whiskers():
     x = np.ones(140)
     x = np.hstack([0, x, 2])
-    
+
     fig1, ax1 = plt.subplots()
     ax1.boxplot([x, x], bootstrap=10000, notch=1)
     ax1.set_ylim((-5, 5))
-    
+
     fig2, ax2 = plt.subplots()
     ax2.boxplot([x, x], bootstrap=10000, notch=1, autorange=True)
     ax2.set_ylim((-5, 5))
