Merge pull request matplotlib#6431 from efiring/merge_from_v2.x

Merge from v2.x

Author: tacaswell

.travis.yml

@@ -77,16 +77,14 @@ install:
     pip install --upgrade wheel
     pip install --upgrade setuptools
   - |
-    # Install dependencies
+    # Install only from travis wheelhouse
     if [ -z "$PRE" ]; then
-        # Install only from travis wheelhouse
-        wheelhouse_pip_install $NUMPY $PANDAS;
+        wheelhouse_pip_install python-dateutil $NUMPY $PANDAS pyparsing!=2.1.2 pillow sphinx!=1.3.0;
     else
-        # Fall back to pypi for non suported python versions
-        pip install $PRE $NUMPY $PANDAS;
+        pip install $PRE python-dateutil $NUMPY pyparsing!=2.1.2 pillow sphinx!=1.3.0;
     fi
     # Always install from pypi
-    pip install $PRE pep8 cycler coveralls coverage python-dateutil pyparsing!=2.0.4
+    pip install $PRE pep8 cycler coveralls coverage
     pip install pillow sphinx!=1.3.0 $MOCK numpydoc ipython colorspacious
     # Install nose from a build which has partial
     # support for python36 and suport for coverage output suppressing

doc/users/whats_new/rcparams.rst

@@ -1,25 +1,27 @@
 Configuration (rcParams)
 ------------------------
 
-+----------------------------+--------------------------------------------------+
-| Parameter                  | Description                                      |
-+============================+==================================================+
-|`date.autoformatter.year`   | foramt string for 'year' scale dates             |
-+----------------------------+--------------------------------------------------+
-|`date.autoformatter.month`  | format string for 'month' scale dates            |
-+----------------------------+--------------------------------------------------+
-|`date.autoformatter.day`    | format string for 'day' scale dates              |
-+----------------------------+--------------------------------------------------+
-|`date.autoformatter.hour`   | format string for 'hour' scale times             |
-+----------------------------+--------------------------------------------------+
-|`date.autoformatter.minute` | format string for 'minute' scale times           |
-+----------------------------+--------------------------------------------------+
-|`date.autoformatter.second` | format string for 'second' scale times           |
-+----------------------------+--------------------------------------------------+
-|`scatter.marker`            | default marker for scatter plot                  |
-+----------------------------+--------------------------------------------------+
-|`svg.hashsalt`              | see note                                         |
-+----------------------------+--------------------------------------------------+
++---------------------------------+--------------------------------------------------+
+| Parameter                       | Description                                      |
++=================================+==================================================+
+|`date.autoformatter.year`        | foramt string for 'year' scale dates             |
++---------------------------------+--------------------------------------------------+
+|`date.autoformatter.month`       | format string for 'month' scale dates            |
++---------------------------------+--------------------------------------------------+
+|`date.autoformatter.day`         | format string for 'day' scale dates              |
++---------------------------------+--------------------------------------------------+
+|`date.autoformatter.hour`        | format string for 'hour' scale times             |
++---------------------------------+--------------------------------------------------+
+|`date.autoformatter.minute`      | format string for 'minute' scale times           |
++---------------------------------+--------------------------------------------------+
+|`date.autoformatter.second`      | format string for 'second' scale times           |
++---------------------------------+--------------------------------------------------+
+|`date.autoformatter.microsecond` | format string for 'microsecond' scale times      |
++---------------------------------+--------------------------------------------------+
+|`scatter.marker`                 | default marker for scatter plot                  |
++---------------------------------+--------------------------------------------------+
+|`svg.hashsalt`                   | see note                                         |
++---------------------------------+--------------------------------------------------+
 
 Added ``svg.hashsalt`` key to rcParams
 ```````````````````````````````````````

lib/matplotlib/animation.py

@@ -36,10 +36,11 @@
 import abc
 import contextlib
 import tempfile
+import warnings
 from matplotlib.cbook import iterable, is_string_like
 from matplotlib.compat import subprocess
 from matplotlib import verbose
-from matplotlib import rcParams, rcParamsDefault
+from matplotlib import rcParams, rcParamsDefault, rc_context
 
 # Process creation flag for subprocess to prevent it raising a terminal
 # window. See for example:
@@ -192,6 +193,11 @@ class MovieWriter(AbstractMovieWriter):
     frame_format: string
         The format used in writing frame data, defaults to 'rgba'
     '''
+
+    # Specifies whether the size of all frames need to be identical
+    # i.e. whether we can use savefig.bbox = 'tight'
+    frame_size_can_vary = False
+
     def __init__(self, fps=5, codec=None, bitrate=None, extra_args=None,
                  metadata=None):
         '''
@@ -210,8 +216,8 @@ def __init__(self, fps=5, codec=None, bitrate=None, extra_args=None,
             automatically by the underlying utility.
         extra_args: list of strings or None
             A list of extra string arguments to be passed to the underlying
-            movie utiltiy. The default is None, which passes the additional
-            argurments in the 'animation.extra_args' rcParam.
+            movie utility. The default is None, which passes the additional
+            arguments in the 'animation.extra_args' rcParam.
         metadata: dict of string:string or None
             A dictionary of keys and values for metadata to include in the
             output file. Some keys that may be of use include:
@@ -355,6 +361,11 @@ def isAvailable(cls):
 
 class FileMovieWriter(MovieWriter):
     '`MovieWriter` subclass that handles writing to a file.'
+
+    # In general, if frames are writen to files on disk, it's not important
+    # that they all be identically sized
+    frame_size_can_vary = True
+
     def __init__(self, *args, **kwargs):
         MovieWriter.__init__(self, *args, **kwargs)
         self.frame_format = rcParams['animation.frame_format']
@@ -491,15 +502,15 @@ class FFMpegBase(object):
 
     @property
     def output_args(self):
-        # The %dk adds 'k' as a suffix so that ffmpeg treats our bitrate as in
-        # kbps
         args = ['-vcodec', self.codec]
         # For h264, the default format is yuv444p, which is not compatible
         # with quicktime (and others). Specifying yuv420p fixes playback on
         # iOS,as well as HTML5 video in firefox and safari (on both Win and
         # OSX). Also fixes internet explorer. This is as of 2015/10/29.
         if self.codec == 'h264' and '-pix_fmt' not in self.extra_args:
             args.extend(['-pix_fmt', 'yuv420p'])
+        # The %dk adds 'k' as a suffix so that ffmpeg treats our bitrate as in
+        # kbps
         if self.bitrate > 0:
             args.extend(['-b', '%dk' % self.bitrate])
         if self.extra_args:
@@ -794,8 +805,8 @@ def save(self, filename, writer=None, fps=None, dpi=None, codec=None,
         `animation.bitrate`.
 
         *extra_args* is a list of extra string arguments to be passed to the
-        underlying movie utiltiy. The default is None, which passes the
-        additional argurments in the 'animation.extra_args' rcParam.
+        underlying movie utility. The default is None, which passes the
+        additional arguments in the 'animation.extra_args' rcParam.
 
         *metadata* is a dictionary of keys and values for metadata to include
         in the output file. Some keys that may be of use include:
@@ -815,29 +826,6 @@ def save(self, filename, writer=None, fps=None, dpi=None, codec=None,
         if savefig_kwargs is None:
             savefig_kwargs = {}
 
-        # FIXME: Using 'bbox_inches' doesn't currently work with
-        # writers that pipe the data to the command because this
-        # requires a fixed frame size (see Ryan May's reply in this
-        # thread: [1]). Thus we drop the 'bbox_inches' argument if it
-        # exists in savefig_kwargs.
-        #
-        # [1] (http://matplotlib.1069221.n5.nabble.com/
-        # Animation-class-let-save-accept-kwargs-which-
-        # are-passed-on-to-savefig-td39627.html)
-        #
-        if 'bbox_inches' in savefig_kwargs:
-            if not (writer in ['ffmpeg_file', 'mencoder_file'] or
-                    isinstance(writer,
-                               (FFMpegFileWriter, MencoderFileWriter))):
-                print("Warning: discarding the 'bbox_inches' argument in "
-                      "'savefig_kwargs' as it is only currently supported "
-                      "with the writers 'ffmpeg_file' and 'mencoder_file' "
-                      "(writer used: "
-                      "'{0}').".format(
-                          writer if isinstance(writer, six.string_types)
-                          else writer.__class__.__name__))
-                savefig_kwargs.pop('bbox_inches')
-
         # Need to disconnect the first draw callback, since we'll be doing
         # draws. Otherwise, we'll end up starting the animation.
         if self._first_draw_id is not None:
@@ -881,7 +869,6 @@ def save(self, filename, writer=None, fps=None, dpi=None, codec=None,
                                          extra_args=extra_args,
                                          metadata=metadata)
             else:
-                import warnings
                 warnings.warn("MovieWriter %s unavailable" % writer)
 
                 try:
@@ -895,22 +882,48 @@ def save(self, filename, writer=None, fps=None, dpi=None, codec=None,
 
         verbose.report('Animation.save using %s' % type(writer),
                        level='helpful')
+
+        # FIXME: Using 'bbox_inches' doesn't currently work with
+        # writers that pipe the data to the command because this
+        # requires a fixed frame size (see Ryan May's reply in this
+        # thread: [1]). Thus we drop the 'bbox_inches' argument if it
+        # exists in savefig_kwargs.
+        #
+        # [1] (http://matplotlib.1069221.n5.nabble.com/
+        # Animation-class-let-save-accept-kwargs-which-
+        # are-passed-on-to-savefig-td39627.html)
+        #
+        if 'bbox_inches' in savefig_kwargs and not writer.frame_size_can_vary:
+            warnings.warn("Warning: discarding the 'bbox_inches' argument in "
+                          "'savefig_kwargs' as it not supported by "
+                          "{0}).".format(writer.__class__.__name__))
+            savefig_kwargs.pop('bbox_inches')
+
         # Create a new sequence of frames for saved data. This is different
         # from new_frame_seq() to give the ability to save 'live' generated
         # frame information to be saved later.
         # TODO: Right now, after closing the figure, saving a movie won't work
         # since GUI widgets are gone. Either need to remove extra code to
-        # allow for this non-existant use case or find a way to make it work.
-        with writer.saving(self._fig, filename, dpi):
-            for anim in all_anim:
-                # Clear the initial frame
-                anim._init_draw()
-            for data in zip(*[a.new_saved_frame_seq()
-                              for a in all_anim]):
-                for anim, d in zip(all_anim, data):
-                    # TODO: Need to see if turning off blit is really necessary
-                    anim._draw_next_frame(d, blit=False)
-                writer.grab_frame(**savefig_kwargs)
+        # allow for this non-existent use case or find a way to make it work.
+        with rc_context():
+            # See above about bbox_inches savefig kwarg
+            if (not writer.frame_size_can_vary and
+                    rcParams['savefig.bbox'] == 'tight'):
+                verbose.report("Disabling savefig.bbox = 'tight', as it is "
+                               "not supported by "
+                               "{0}.".format(writer.__class__.__name__),
+                               level='helpful')
+                rcParams['savefig.bbox'] = None
+            with writer.saving(self._fig, filename, dpi):
+                for anim in all_anim:
+                    # Clear the initial frame
+                    anim._init_draw()
+                for data in zip(*[a.new_saved_frame_seq()
+                                  for a in all_anim]):
+                    for anim, d in zip(all_anim, data):
+                        # TODO: See if turning off blit is really necessary
+                        anim._draw_next_frame(d, blit=False)
+                    writer.grab_frame(**savefig_kwargs)
 
         # Reconnect signal for first draw if necessary
         if reconnect_first_draw:
@@ -1038,7 +1051,7 @@ def to_html5_video(self):
         directly into the HTML5 video tag. This respects the rc parameters
         for the writer as well as the bitrate. This also makes use of the
         ``interval`` to control the speed, and uses the ``repeat``
-        paramter to decide whether to loop.
+        parameter to decide whether to loop.
         '''
         VIDEO_TAG = r'''<video {size} {options}>
   <source type="video/mp4" src="data:video/mp4;base64,{video}">

lib/matplotlib/axes/_base.py

@@ -576,7 +576,8 @@ def __init__(self, fig, rect,
         self.tick_params(top=rcParams['xtick.top'],
                          bottom=rcParams['xtick.bottom'],
                          left=rcParams['ytick.left'],
-                         right=rcParams['ytick.right'])
+                         right=rcParams['ytick.right'],
+                         which='both')
 
     def __setstate__(self, state):
         self.__dict__ = state

lib/matplotlib/backends/backend_qt5.py

@@ -751,13 +751,17 @@ def __init__(self, targetfig, parent):
 
         self.defaults = {}
         for attr in ('left', 'bottom', 'right', 'top', 'wspace', 'hspace', ):
-            self.defaults[attr] = getattr(self.targetfig.subplotpars, attr)
+            val = getattr(self.targetfig.subplotpars, attr)
+            self.defaults[attr] = val
             slider = getattr(self, 'slider' + attr)
+            txt = getattr(self, attr + 'value')
             slider.setMinimum(0)
             slider.setMaximum(1000)
             slider.setSingleStep(5)
+            # do this before hooking up the callbacks
+            slider.setSliderPosition(int(val * 1000))
+            txt.setText("%.2f" % val)
             slider.valueChanged.connect(getattr(self, 'func' + attr))
-
         self._setSliderPositions()
 
     def _setSliderPositions(self):
@@ -772,7 +776,7 @@ def funcleft(self, val):
         self.targetfig.subplots_adjust(left=val)
         self.leftvalue.setText("%.2f" % val)
         if self.drawon:
-            self.targetfig.canvas.draw()
+            self.targetfig.canvas.draw_idle()
 
     def funcright(self, val):
         if val == self.sliderleft.value():
@@ -781,7 +785,7 @@ def funcright(self, val):
         self.targetfig.subplots_adjust(right=val)
         self.rightvalue.setText("%.2f" % val)
         if self.drawon:
-            self.targetfig.canvas.draw()
+            self.targetfig.canvas.draw_idle()
 
     def funcbottom(self, val):
         if val == self.slidertop.value():
@@ -790,7 +794,7 @@ def funcbottom(self, val):
         self.targetfig.subplots_adjust(bottom=val)
         self.bottomvalue.setText("%.2f" % val)
         if self.drawon:
-            self.targetfig.canvas.draw()
+            self.targetfig.canvas.draw_idle()
 
     def functop(self, val):
         if val == self.sliderbottom.value():
@@ -799,31 +803,31 @@ def functop(self, val):
         self.targetfig.subplots_adjust(top=val)
         self.topvalue.setText("%.2f" % val)
         if self.drawon:
-            self.targetfig.canvas.draw()
+            self.targetfig.canvas.draw_idle()
 
     def funcwspace(self, val):
         val /= 1000.
         self.targetfig.subplots_adjust(wspace=val)
         self.wspacevalue.setText("%.2f" % val)
         if self.drawon:
-            self.targetfig.canvas.draw()
+            self.targetfig.canvas.draw_idle()
 
     def funchspace(self, val):
         val /= 1000.
         self.targetfig.subplots_adjust(hspace=val)
         self.hspacevalue.setText("%.2f" % val)
         if self.drawon:
-            self.targetfig.canvas.draw()
+            self.targetfig.canvas.draw_idle()
 
     def functight(self):
         self.targetfig.tight_layout()
         self._setSliderPositions()
-        self.targetfig.canvas.draw()
+        self.targetfig.canvas.draw_idle()
 
     def reset(self):
         self.targetfig.subplots_adjust(**self.defaults)
         self._setSliderPositions()
-        self.targetfig.canvas.draw()
+        self.targetfig.canvas.draw_idle()
 
 
 def error_msg_qt(msg, parent=None):

lib/matplotlib/cbook.py

@@ -1452,8 +1452,8 @@ def issubclass_safe(x, klass):
         return False
 
 
-def safe_masked_invalid(x):
-    x = np.asanyarray(x)
+def safe_masked_invalid(x, copy=False):
+    x = np.array(x, subok=True, copy=copy)
     try:
         xm = np.ma.masked_invalid(x, copy=False)
         xm.shrink_mask()

lib/matplotlib/contour.py

@@ -1133,7 +1133,7 @@ def changed(self):
         # add label colors
         cm.ScalarMappable.changed(self)
 
-    def _autolev(self, z, N):
+    def _autolev(self, N):
         """
         Select contour levels to span the data.
 
@@ -1169,12 +1169,12 @@ def _contour_level_args(self, z, args):
         self._auto = False
         if self.levels is None:
             if len(args) == 0:
-                lev = self._autolev(z, 7)
+                lev = self._autolev(7)
             else:
                 level_arg = args[0]
                 try:
                     if type(level_arg) == int:
-                        lev = self._autolev(z, level_arg)
+                        lev = self._autolev(level_arg)
                     else:
                         lev = np.asarray(level_arg).astype(np.float64)
                 except:
@@ -1547,12 +1547,12 @@ def _contour_args(self, args, kwargs):
             raise TypeError("Too many arguments to %s; see help(%s)" %
                             (fn, fn))
         z = ma.masked_invalid(z, copy=False)
-        self.zmax = ma.maximum(z)
-        self.zmin = ma.minimum(z)
+        self.zmax = float(z.max())
+        self.zmin = float(z.min())
         if self.logscale and self.zmin <= 0:
             z = ma.masked_where(z <= 0, z)
             warnings.warn('Log scale: values of z <= 0 have been masked')
-            self.zmin = z.min()
+            self.zmin = float(z.min())
         self._contour_level_args(z, args)
         return (x, y, z)