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

tacaswell · tacaswell · commit bf2cd2530740 · 2016-12-01T23:20:22.000-05:00
diff --git a/doc/devel/testing.rst b/doc/devel/testing.rst
@@ -266,7 +266,8 @@ example <https://travis-ci.org/msabramo/matplotlib>`_.
 Using tox
 ---------
 
-`Tox <http://tox.testrun.org/>`_ is a tool for running tests against
+`Tox <https://tox.readthedocs.io/en/latest/>`_ is a tool for running
+tests against
 multiple Python environments, including multiple versions of Python
 (e.g., 2.7, 3.4, 3.5) and even different Python implementations
 altogether (e.g., CPython, PyPy, Jython, etc.)
diff --git a/doc/resources/index.rst b/doc/resources/index.rst
@@ -37,10 +37,6 @@
  Videos
 =======
 
-* `Getting started with Matplotlib
-  <http://showmedo.com/videotutorials/video?name=7200090&fromSeriesID=720>`_
-  by `unpingco <http://showmedo.com/videotutorials/?author=6237>`_
-
 * `Plotting with matplotlib <http://www.youtube.com/watch?v=P7SVi0YTIuE>`_
   by Mike Müller
 
diff --git a/doc/users/colormaps.rst b/doc/users/colormaps.rst
@@ -186,6 +186,6 @@ References
 .. [mycarta-lablinear] http://mycarta.wordpress.com/2012/12/06/the-rainbow-is-deadlong-live-the-rainbow-part-5-cie-lab-linear-l-rainbow/
 .. [mycarta-cubelaw] http://mycarta.wordpress.com/2013/02/21/perceptual-rainbow-palette-the-method/
 .. [bw] http://www.tannerhelland.com/3643/grayscale-image-algorithm-vb6/
-.. [colorblindness] http://aspnetresources.com/tools/colorBlindness
+.. [colorblindness] http://www.color-blindness.com/
 .. [asp] http://aspnetresources.com/tools/colorBlindness
 .. [IBM] http://www.research.ibm.com/people/l/lloydt/color/color.HTM
diff --git a/doc/users/prev_whats_new/whats_new_1.0.rst b/doc/users/prev_whats_new/whats_new_1.0.rst
@@ -69,7 +69,7 @@ figures since the last call.  Eric has done a lot of testing on the
 user interface toolkits and versions and platforms he has access to,
 but it is not possible to test them all, so please report problems to
 the `mailing list
-<http://mail.python.org/mailman/listinfo/matplotlib users>`__
+<https://mail.python.org/mailman/listinfo/matplotlib-users>`__
 and `bug tracker
 <http://github.com/matplotlib/matplotlib/issues>`__.
 
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
@@ -311,7 +311,10 @@ def __init__(self, ax, cmap=None,
             self.locator = ticks    # Handle default in _ticker()
         if format is None:
             if isinstance(self.norm, colors.LogNorm):
-                self.formatter = ticker.LogFormatterMathtext()
+                self.formatter = ticker.LogFormatterSciNotation()
+            elif isinstance(self.norm, colors.SymLogNorm):
+                self.formatter = ticker.LogFormatterSciNotation(
+                                        linthresh=self.norm.linthresh)
             else:
                 self.formatter = ticker.ScalarFormatter()
         elif cbook.is_string_like(format):
@@ -579,7 +582,14 @@ def _ticker(self):
                     b = self.norm.boundaries
                     locator = ticker.FixedLocator(b, nbins=10)
                 elif isinstance(self.norm, colors.LogNorm):
-                    locator = ticker.LogLocator()
+                    locator = ticker.LogLocator(subs='all')
+                elif isinstance(self.norm, colors.SymLogNorm):
+                    # The subs setting here should be replaced
+                    # by logic in the locator.
+                    locator = ticker.SymmetricalLogLocator(
+                                      subs=np.arange(1, 10),
+                                      linthresh=self.norm.linthresh,
+                                      base=10)
                 else:
                     if mpl.rcParams['_internal.classic_mode']:
                         locator = ticker.MaxNLocator()
diff --git a/lib/matplotlib/pylab.py b/lib/matplotlib/pylab.py
@@ -225,7 +225,9 @@
 import matplotlib as mpl
 # make mpl.finance module available for backwards compatability, in case folks
 # using pylab interface depended on not having to import it
-import matplotlib.finance
+with warnings.catch_warnings():
+    warnings.simplefilter("ignore")  # deprecation: moved to a toolkit
+    import matplotlib.finance
 
 from matplotlib.dates import (
     date2num, num2date, datestr2num, strpdate2num, drange, epoch2num,
diff --git a/lib/matplotlib/scale.py b/lib/matplotlib/scale.py
@@ -249,7 +249,9 @@ def set_default_locators_and_formatters(self, axis):
         axis.set_major_locator(LogLocator(self.base))
         axis.set_major_formatter(LogFormatterSciNotation(self.base))
         axis.set_minor_locator(LogLocator(self.base, self.subs))
-        axis.set_minor_formatter(LogFormatterSciNotation(self.base, self.subs))
+        axis.set_minor_formatter(
+            LogFormatterSciNotation(self.base,
+                                    labelOnlyBase=self.subs))
 
     def get_transform(self):
         """
diff --git a/lib/matplotlib/tests/test_scale.py b/lib/matplotlib/tests/test_scale.py
@@ -46,3 +46,8 @@ def test_log_scatter():
 
     buf = io.BytesIO()
     fig.savefig(buf, format='svg')
+
+
+if __name__ == '__main__':
+    import nose
+    nose.runmodule(argv=['-s', '--with-doctest'], exit=False)
diff --git a/lib/matplotlib/tests/test_ticker.py b/lib/matplotlib/tests/test_ticker.py
@@ -164,8 +164,7 @@ def test_SymmetricalLogLocator_set_params():
     See if change was successful.
     Should not exception.
     """
-    # since we only test for the params change. I will pass empty transform
-    sym = mticker.SymmetricalLogLocator(None)
+    sym = mticker.SymmetricalLogLocator(base=10, linthresh=1)
     sym.set_params(subs=[2.0], numticks=8)
     assert sym._subs == [2.0]
     assert sym.numticks == 8
@@ -245,7 +244,7 @@ def test_LogFormatter_sublabel():
     ax.xaxis.set_major_locator(mticker.LogLocator(base=10, subs=[]))
     ax.xaxis.set_minor_locator(mticker.LogLocator(base=10,
                                                   subs=np.arange(2, 10)))
-    ax.xaxis.set_major_formatter(mticker.LogFormatter())
+    ax.xaxis.set_major_formatter(mticker.LogFormatter(labelOnlyBase=True))
     ax.xaxis.set_minor_formatter(mticker.LogFormatter(labelOnlyBase=False))
     # axis range above 3 decades, only bases are labeled
     ax.set_xlim(1, 1e4)
@@ -266,9 +265,13 @@ def test_LogFormatter_sublabel():
     ax.set_xlim(1, 80)
     _sub_labels(ax.xaxis, subs=[])
 
-    # axis range at 0 to 1 decades, label subs 2, 3, 6
+    # axis range at 0.4 to 1 decades, label subs 2, 3, 4, 6
     ax.set_xlim(1, 8)
-    _sub_labels(ax.xaxis, subs=[2, 3, 6])
+    _sub_labels(ax.xaxis, subs=[2, 3, 4, 6])
+
+    # axis range at 0 to 0.4 decades, label all
+    ax.set_xlim(0.5, 0.9)
+    _sub_labels(ax.xaxis, subs=np.arange(2, 10, dtype=int))
 
 
 class FakeAxis(object):
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
