MAINT created a new private _classic_test stylesheet

NelleV · NelleV · commit b03b71a5e0ea · 2017-02-15T11:00:03.000-08:00
This allows the public classic stylesheet to be 'more' backward compatible
diff --git a/doc/users/dflt_style_changes.rst b/doc/users/dflt_style_changes.rst
@@ -15,9 +15,6 @@ values is a single line of python
 
   mpl.style.use('classic')
 
-Note that to revert the position of tick labels, you need in addition to set
-the rcParams `ytick.alignment` to "center".
-
 See :ref:`customizing-with-matplotlibrc-files` for details about how to
 persistently and selectively revert many of these changes.
 
diff --git a/lib/matplotlib/mpl-data/stylelib/_classic_test.mplstyle b/lib/matplotlib/mpl-data/stylelib/_classic_test.mplstyle
diff --git a/lib/matplotlib/mpl-data/stylelib/classic.mplstyle b/lib/matplotlib/mpl-data/stylelib/classic.mplstyle
@@ -271,6 +271,7 @@ ytick.major.left     : True   # draw y axis left major ticks
 ytick.major.right    : True   # draw y axis right major ticks
 ytick.minor.left     : True   # draw y axis left minor ticks
 ytick.minor.right    : True   # draw y axis right minor ticks
+ytick.alignment      : center
 
 ### GRIDS
 grid.color       :   k       # grid color
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -12,9 +12,9 @@
 import warnings
 import unittest
 
-# Note - don't import nose up here - import it only as needed in functions. This
-# allows other functions here to be used by pytest-based testing suites without
-# requiring nose to be installed.
+# Note - don't import nose up here - import it only as needed in functions.
+# This allows other functions here to be used by pytest-based testing suites
+# without requiring nose to be installed.
 
 import numpy as np
 
@@ -163,7 +163,7 @@ def wrapped_callable(*args, **kwargs):
         return make_cleanup
     else:
         result = make_cleanup(style)
-        style = 'classic'
+        style = '_classic_test'
         return result
 
 
@@ -268,43 +268,42 @@ def do_test(fignum, actual_fname, expected_fname):
 
 def image_comparison(baseline_images=None, extensions=None, tol=0,
                      freetype_version=None, remove_text=False,
-                     savefig_kwarg=None, style='classic'):
+                     savefig_kwarg=None, style='_classic_test'):
     """
     Compare images generated by the test with those specified in
     *baseline_images*, which must correspond else an
     ImageComparisonFailure exception will be raised.
 
-    Keyword arguments:
+    Arguments
+    ---------
+    baseline_images : list
+        A list of strings specifying the names of the images generated by
+        calls to :meth:`matplotlib.figure.savefig`.
 
-      *baseline_images*: list
-        A list of strings specifying the names of the images generated
-        by calls to :meth:`matplotlib.figure.savefig`.
-
-      *extensions*: [ None | list ]
-
-        If *None*, default to all supported extensions.
+    extensions : [ None | list ]
 
+        If None, defaults to all supported extensions.
         Otherwise, a list of extensions to test. For example ['png','pdf'].
 
-      *tol*: (default 0)
+    tol : float, optional, default: 0
         The RMS threshold above which the test is considered failed.
 
-      *freetype_version*: str or tuple
-        The expected freetype version or range of versions for this
-        test to pass.
+    freetype_version : str or tuple
+        The expected freetype version or range of versions for this test to
+        pass.
 
-      *remove_text*: bool
-        Remove the title and tick text from the figure before
-        comparison.  This does not remove other, more deliberate,
-        text, such as legends and annotations.
+    remove_text : bool
+        Remove the title and tick text from the figure before comparison.
+        This does not remove other, more deliberate, text, such as legends and
+        annotations.
 
-      *savefig_kwarg*: dict
+    savefig_kwarg : dict
         Optional arguments that are passed to the savefig method.
 
-      *style*: string
-        Optional name for the base style to apply to the image
-        test. The test itself can also apply additional styles
-        if desired. Defaults to the 'classic' style.
+    style : string
+        Optional name for the base style to apply to the image test. The test
+        itself can also apply additional styles if desired. Defaults to the
+        '_classic_test' style.
 
     """
     if baseline_images is None:
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -1143,7 +1143,7 @@ def test_bar_tick_label_multiple():
     ax.bar([1, 2.5], [1, 2], width=[0.2, 0.5], tick_label=['a', 'b'],
            align='center')
 
-@image_comparison(baseline_images=['bar_tick_label_multiple_old_alignment'],
+@image_comparison(baseline_images=['bar_tick_label_multiple_old_label_alignment'],
                   extensions=['png'])
 def test_bar_tick_label_multiple_old_alignment():
     # From 2516: plot bar with array of string labels for x axis
diff --git a/lib/matplotlib/tests/test_backend_pgf.py b/lib/matplotlib/tests/test_backend_pgf.py
@@ -78,7 +78,7 @@ def create_figure():
 
 
 # test compiling a figure to pdf with xelatex
-@cleanup(style='classic')
+@cleanup(style='_classic_test')
 @switch_backend('pgf')
 def test_xelatex():
     if not check_for('xelatex'):
@@ -92,7 +92,7 @@ def test_xelatex():
 
 
 # test compiling a figure to pdf with pdflatex
-@cleanup(style='classic')
+@cleanup(style='_classic_test')
 @switch_backend('pgf')
 def test_pdflatex():
     if not check_for('pdflatex'):
@@ -109,7 +109,7 @@ def test_pdflatex():
 
 
 # test updating the rc parameters for each figure
-@cleanup(style='classic')
+@cleanup(style='_classic_test')
 @switch_backend('pgf')
 def test_rcupdate():
     if not check_for('xelatex') or not check_for('pdflatex'):
@@ -142,7 +142,7 @@ def test_rcupdate():
 
 
 # test backend-side clipping, since large numbers are not supported by TeX
-@cleanup(style='classic')
+@cleanup(style='_classic_test')
 @switch_backend('pgf')
 def test_pathclip():
     if not check_for('xelatex'):
@@ -161,7 +161,7 @@ def test_pathclip():
 
 
 # test mixed mode rendering
-@cleanup(style='classic')
+@cleanup(style='_classic_test')
 @switch_backend('pgf')
 def test_mixedmode():
     if not check_for('xelatex'):
@@ -178,7 +178,7 @@ def test_mixedmode():
 
 
 # test bbox_inches clipping
-@cleanup(style='classic')
+@cleanup(style='_classic_test')
 @switch_backend('pgf')
 def test_bbox_inches():
     if not check_for('xelatex'):
diff --git a/lib/matplotlib/tests/test_ticker.py b/lib/matplotlib/tests/test_ticker.py
@@ -13,7 +13,7 @@
 import warnings
 
 
-@cleanup(style='classic')
+@cleanup(style='_classic_test')
 def test_MaxNLocator():
     loc = mticker.MaxNLocator(nbins=5)
     test_value = np.array([20., 40., 60., 80., 100.])
@@ -172,7 +172,7 @@ def test_SymmetricalLogLocator_set_params():
     nose.tools.assert_equal(sym.numticks, 8)
 
 
-@cleanup(style='classic')
+@cleanup(style='_classic_test')
 def test_ScalarFormatter_offset_value():
     fig, ax = plt.subplots()
     formatter = ax.get_xaxis().get_major_formatter()
