Merge branch 'v2.0.x'

mdboom · mdboom · commit f4209922972a · 2015-11-30T14:32:00.000-05:00
diff --git a/doc/users/whats_new/ticks_rcparams.rst b/doc/users/whats_new/ticks_rcparams.rst
@@ -1,6 +1,10 @@
 New rcParams
 ------------
 
-The parameters `xtick.top`, `xtick.bottom`, `ytick.left`
-and `ytick.right` were added to control where the ticks
-are drawn.
+The parameters ``xtick.top``, ``xtick.bottom``, ``ytick.left``
+and ``ytick.right`` were added to control where the ticks
+are drawn.
+
+``hist.bins`` to control the default number of bins to use in
+`~matplotlib.axes.Axes.hist`.  This can be an `int`, a list of floats, or
+``'auto'`` if numpy >= 1.11 is installed.
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -4442,7 +4442,7 @@ def stackplot(self, x, *args, **kwargs):
                          label_namer=None)
     def streamplot(self, x, y, u, v, density=1, linewidth=None, color=None,
                    cmap=None, norm=None, arrowsize=1, arrowstyle='-|>',
-                   minlength=0.1, transform=None, zorder=1, start_points=None):
+                   minlength=0.1, transform=None, zorder=2, start_points=None):
         if not self._hold:
             self.cla()
         stream_container = mstream.streamplot(self, x, y, u, v,
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -1136,7 +1136,13 @@ def set_color_cycle(self, clist):
         """
         cbook.warn_deprecated(
             '1.5', name='set_color_cycle', alternative='set_prop_cycle')
-        self.set_prop_cycle('color', clist)
+        if clist is None:
+            # Calling set_color_cycle() or set_prop_cycle() with None
+            # effectively resets the cycle, but you can't do
+            # set_prop_cycle('color', None). So we are special-casing this.
+            self.set_prop_cycle(None)
+        else:
+            self.set_prop_cycle('color', clist)
 
     def ishold(self):
         """return the HOLD status of the axes"""
diff --git a/lib/matplotlib/mpl-data/stylelib/classic.mplstyle b/lib/matplotlib/mpl-data/stylelib/classic.mplstyle
@@ -29,6 +29,8 @@ patch.facecolor        : b
 patch.edgecolor        : k
 patch.antialiased      : True    # render patches in antialiased (no jaggies)
 
+hist.bins              : 10
+
 ### FONT
 #
 # font properties used by text.Text.  See
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -3273,7 +3273,7 @@ def step(x, y, *args, **kwargs):
 @_autogen_docstring(Axes.streamplot)
 def streamplot(x, y, u, v, density=1, linewidth=None, color=None, cmap=None,
                norm=None, arrowsize=1, arrowstyle='-|>', minlength=0.1,
-               transform=None, zorder=1, start_points=None, hold=None, data=None):
+               transform=None, zorder=2, start_points=None, hold=None, data=None):
     ax = gca()
     # allow callers to override the hold state by passing hold=True|False
     washold = ax.ishold()
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -770,6 +770,23 @@ def validate_cycler(s):
     return cycler_inst
 
 
+def validate_hist_bins(s):
+    if isinstance(s, six.text_type) and s == 'auto':
+        return s
+    try:
+        return int(s)
+    except (TypeError, ValueError):
+        pass
+
+    try:
+        return validate_floatlist(s)
+    except ValueError:
+        pass
+
+    raise ValueError("'hist.bins' must be 'auto', an int or " +
+                     "a sequence of floats")
+
+
 # a map from key -> value, converter
 defaultParams = {
     'backend':           ['Agg', validate_backend],  # agg is certainly
@@ -814,7 +831,7 @@ def validate_cycler(s):
     'patch.antialiased': [True, validate_bool],  # antialiased (no jaggies)
 
     ## Histogram properties
-    'hist.bins': [10, validate_any],
+    'hist.bins': [10, validate_hist_bins],
 
     ## Boxplot properties
     'boxplot.notch': [False, validate_bool],
diff --git a/lib/matplotlib/streamplot.py b/lib/matplotlib/streamplot.py
@@ -21,7 +21,7 @@
 
 def streamplot(axes, x, y, u, v, density=1, linewidth=None, color=None,
                cmap=None, norm=None, arrowsize=1, arrowstyle='-|>',
-               minlength=0.1, transform=None, zorder=1, start_points=None):
+               minlength=0.1, transform=None, zorder=2, start_points=None):
     """Draws streamlines of a vector flow.
 
     *x*, *y* : 1d arrays
diff --git a/lib/matplotlib/tests/test_cycles.py b/lib/matplotlib/tests/test_cycles.py
@@ -1,3 +1,5 @@
+import warnings
+
 from matplotlib.testing.decorators import image_comparison, cleanup
 import matplotlib.pyplot as plt
 import numpy as np
@@ -147,6 +149,30 @@ def test_valid_input_forms():
     assert True
 
 
+@cleanup
+def test_cycle_reset():
+    fig, ax = plt.subplots()
+
+    # Can't really test a reset because only a cycle object is stored
+    # but we can test the first item of the cycle.
+    prop = next(ax._get_lines.prop_cycler)
+    ax.set_prop_cycle(linewidth=[10, 9, 4])
+    assert prop != next(ax._get_lines.prop_cycler)
+    ax.set_prop_cycle(None)
+    got = next(ax._get_lines.prop_cycler)
+    assert prop == got, "expected %s, got %s" % (prop, got)
+
+    fig, ax = plt.subplots()
+    # Need to double-check the old set/get_color_cycle(), too
+    with warnings.catch_warnings():
+        prop = next(ax._get_lines.prop_cycler)
+        ax.set_color_cycle(['c', 'm', 'y', 'k'])
+        assert prop != next(ax._get_lines.prop_cycler)
+        ax.set_color_cycle(None)
+        got = next(ax._get_lines.prop_cycler)
+        assert prop == got, "expected %s, got %s" % (prop, got)
+
+
 @cleanup
 def test_invalid_input_forms():
     fig, ax = plt.subplots()
diff --git a/lib/matplotlib/tests/test_pickle.py b/lib/matplotlib/tests/test_pickle.py
@@ -279,6 +279,9 @@ def test_transform():
     assert_equal(obj.wrapper._child, obj.composite)
     # Check child -> parent links of TransformWrapper.
     assert_equal(list(obj.wrapper._parents.values()), [obj.composite2])
+    # Check input and output dimensions are set as expected.
+    assert_equal(obj.wrapper.input_dims, obj.composite.input_dims)
+    assert_equal(obj.wrapper.output_dims, obj.composite.output_dims)
 
 
 if __name__ == '__main__':
diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
@@ -27,7 +27,8 @@
                                 validate_nseq_int,
                                 validate_nseq_float,
                                 validate_cycler,
-                                validate_hatch)
+                                validate_hatch,
+                                validate_hist_bins)
 
 
 mpl.rc('text', usetex=False)
@@ -363,7 +364,17 @@ def test_validators():
                     ),
          'fail': (('fish', ValueError),
                  ),
-        }
+        },
+        {'validator': validate_hist_bins,
+         'success': (('auto', 'auto'),
+                     ('10', 10),
+                     ('1, 2, 3', [1, 2, 3]),
+                     ([1, 2, 3], [1, 2, 3]),
+                     (np.arange(15), np.arange(15))
+                     ),
+         'fail': (('aardvark', ValueError),
+                  )
+         }
     )
 
     for validator_dict in validation_tests:
diff --git a/lib/matplotlib/transforms.py b/lib/matplotlib/transforms.py
@@ -1552,17 +1552,24 @@ def __eq__(self, other):
         def __str__(self):
             return str(self._child)
 
+    # NOTE: Transform.__[gs]etstate__ should be sufficient when using only
+    # Python 3.4+.
     def __getstate__(self):
-        # only store the child and parents
+        # only store the child information and parents
         return {
             'child': self._child,
+            'input_dims': self.input_dims,
+            'output_dims': self.output_dims,
             # turn the weakkey dictionary into a normal dictionary
             'parents': dict(six.iteritems(self._parents))
         }
 
     def __setstate__(self, state):
         # re-initialise the TransformWrapper with the state's child
         self._init(state['child'])
+        # The child may not be unpickled yet, so restore its information.
+        self.input_dims = state['input_dims']
+        self.output_dims = state['output_dims']
         # turn the normal dictionary back into a WeakValueDictionary
         self._parents = WeakValueDictionary(state['parents'])
 

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ patch.facecolor : b`
`29`	`29`	`patch.edgecolor : k`
`30`	`30`	`patch.antialiased : True # render patches in antialiased (no jaggies)`
`31`	`31`
	`32`	`+hist.bins : 10`
	`33`	`+`
`32`	`34`	`### FONT`
`33`	`35`	`#`
`34`	`36`	`# font properties used by text.Text. See`