merge remote-tracking branch 'matplotlib/v1.5.x' into v2.x

tacaswell · tacaswell · commit 732efa3cf47f · 2016-03-04T00:21:54.000-05:00
diff --git a/doc/_static/ggplot.png b/doc/_static/ggplot.png
diff --git a/doc/_static/holoviews.png b/doc/_static/holoviews.png
diff --git a/doc/_static/seaborn.png b/doc/_static/seaborn.png
diff --git a/doc/_templates/index.html b/doc/_templates/index.html
@@ -158,7 +158,11 @@ <h1>Toolkits</h1>
 including a choice of two projection and mapping toolkits <a href="http://matplotlib.org/basemap">basemap</a> and
 <a href="http://scitools.org.uk/cartopy/docs/latest">cartopy</a>,
 3d plotting with <a href="{{ pathto('mpl_toolkits/mplot3d/index') }}">mplot3d</a>,
-axes and axis helpers in <a href="{{ pathto('mpl_toolkits/axes_grid/index') }}">axes_grid</a> and more.
+axes and axis helpers in <a href="{{ pathto('mpl_toolkits/axes_grid/index') }}">axes_grid</a>,
+several higher-level plotting interfaces
+    <a href="http://web.stanford.edu/~mwaskom/software/seaborn">seaborn</a>,
+    <a href="http://holoviews.org">holoviews</a>,
+    <a href="http://ggplot.yhathq.com">ggplot</a>, and more.
  </p>
 
 <h1>Citing matplotlib</h1>
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
@@ -161,8 +161,6 @@ <h3>{{ _('Navigation') }}</h3>
 
 {% block relbar1 %}
 
-<link rel="shortcut icon" href="/_static/favicon.ico">
-
 <!-- The "Fork me on github" ribbon -->
 <img style="float: right; margin-bottom: -40px; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png" usemap="#ribbonmap"/>
 <map name="ribbonmap">
diff --git a/doc/conf.py b/doc/conf.py
@@ -213,6 +213,8 @@
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'Matplotlibdoc'
 
+# Path to favicon
+html_favicon = '_static/favicon.ico'
 
 # Options for LaTeX output
 # ------------------------
diff --git a/doc/mpl_toolkits/index.rst b/doc/mpl_toolkits/index.rst
@@ -172,6 +172,26 @@ level interface for drawing statistical graphics with matplotlib. It
 aims to make visualization a central part of exploring and
 understanding complex datasets.
 
+.. image:: /_static/seaborn.png
+    :height: 157px
+
+.. _toolkit_holoviews:
+
+holoviews
+=========
+(*Not distributed with matplotlib*)
+
+`holoviews <http://holoviews.org>`_ makes it easier to visualize data
+interactively, especially in a `Jupyter notebook
+<http://jupyter.org>`_, by providing a set of declarative
+plotting objects that store your data and associated metadata.  Your
+data is then immediately visualizable alongside or overlaid with other
+data, either statically or with automatically provided widgets for
+parameter exploration.
+
+.. image:: /_static/holoviews.png
+    :height: 354px
+
 .. _toolkit_ggplot:
 
 ggplot
@@ -181,6 +201,9 @@ ggplot
 `ggplot <https://github.com/yhat/ggplot>`_ is a port of the R ggplot2
 to python based on matplotlib.
 
+.. image:: /_static/ggplot.png
+    :height: 195px
+
 
 .. _toolkit_prettyplotlib:
 
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -342,7 +342,7 @@ def _apply_params(self, **kw):
                 # -> points. grab the integer from the `Text` object
                 # instead of saving the string representation
                 v = getattr(self.label1, 'get_' + k)()
-                setattr(self, '_' + k, v)
+                setattr(self, '_label' + k, v)
 
 
 class XTick(Tick):
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -510,7 +510,7 @@ def set_linestyle(self, ls):
         ===========================   =================
         ``'-'`` or ``'solid'``        solid line
         ``'--'`` or  ``'dashed'``     dashed line
-        ``'-.'`` or  ``'dash_dot'``   dash-dotted line
+        ``'-.'`` or  ``'dashdot'``    dash-dotted line
         ``':'`` or ``'dotted'``       dotted line
         ===========================   =================
 
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -1012,7 +1012,7 @@ def set_linestyle(self, ls):
         ===========================   =================
         ``'-'`` or ``'solid'``        solid line
         ``'--'`` or  ``'dashed'``     dashed line
-        ``'-.'`` or  ``'dash_dot'``   dash-dotted line
+        ``'-.'`` or  ``'dashdot'``    dash-dotted line
         ``':'`` or ``'dotted'``       dotted line
         ``'None'``                    draw nothing
         ``' '``                       draw nothing
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -370,7 +370,7 @@ def set_linestyle(self, ls):
         ===========================   =================
         ``'-'`` or ``'solid'``        solid line
         ``'--'`` or  ``'dashed'``     dashed line
-        ``'-.'`` or  ``'dash_dot'``   dash-dotted line
+        ``'-.'`` or  ``'dashdot'``    dash-dotted line
         ``':'`` or ``'dotted'``       dotted line
         ===========================   =================
 
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -4330,6 +4330,17 @@ def test_pandas_indexing_hist():
     fig, axes = plt.subplots()
     axes.hist(ser_2)
 
+@cleanup
+def test_axis_set_tick_params_labelsize_labelcolor():
+    # Tests fix for issue 4346
+    axis_1 = plt.subplot()
+    axis_1.yaxis.set_tick_params(labelsize=30, labelcolor='red', direction='out')
+
+    # Expected values after setting the ticks
+    assert axis_1.yaxis.majorTicks[0]._size == 4.0
+    assert axis_1.yaxis.majorTicks[0]._color == 'k'
+    assert axis_1.yaxis.majorTicks[0]._labelsize == 30.0
+    assert axis_1.yaxis.majorTicks[0]._labelcolor == 'red'
 
 if __name__ == '__main__':
     import nose
