8000 merge remote-tracking branch 'matplotlib/v1.5.x' into v2.x · andnovar/matplotlib@732efa3 · GitHub
[go: up one dir, main page]
65F8 Skip to content

Commit 732efa3

Browse files
tacaswelltacaswell
committed
merge remote-tracking branch 'matplotlib/v1.5.x' into v2.x
2 parents 1302606 + b89ddd3 commit 732efa3

File tree

12 files changed

+45
-7
lines changed

12 files changed

+45
-7
lines changed

‎doc/_static/ggplot.png

39.2 KB
Loading

‎doc/_static/holoviews.png

114 KB
Loading

‎doc/_static/seaborn.png

103 KB
Loading

‎doc/_templates/index.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,11 @@ <h1>Toolkits</h1>
158158
including a choice of two projection and mapping toolkits <a href="http://matplotlib.org/basemap">basemap</a> and
159159
<a href="http://scitools.org.uk/cartopy/docs/latest">cartopy</a>,
160160
3d plotting with <a href="{{ pathto('mpl_toolkits/mplot3d/index') }}">mplot3d</a>,
161-
axes and axis helpers in <a href="{{ pathto('mpl_toolkits/axes_grid/index') }}">axes_grid</a> and more.
161+
axes and axis helpers in <a href="{{ pathto('mpl_toolkits/axes_grid/index') }}">axes_grid</a>,
162+
several higher-level plotting interfaces
163+
<a href="http://web.stanford.edu/~mwaskom/software/seaborn">seaborn</a>,
164+
<a href="http://holoviews.org">holoviews</a>,
165+
<a href="http://ggplot.yhathq.com">ggplot</a>, and more.
162166
</p>
163167

164168
<h1>Citing matplotlib</h1>

‎doc/_templates/layout.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,6 @@ <h3>{{ _('Navigation') }}</h3>
161161

162162
{% block relbar1 %}
163163

164-
<link rel="shortcut icon" href="/_static/favicon.ico">
165-
166164
<!-- The "Fork me on github" ribbon -->
167165
<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"/>
168166
<map name="ribbonmap">

‎doc/conf.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,8 @@
213213
# Output file base name for HTML help builder.
214214
htmlhelp_basename = 'Matplotlibdoc'
215215

216+
# Path to favicon
217+
html_favicon = '_static/favicon.ico'
216218

217219
# Options for LaTeX output
218220
# ------------------------

‎doc/mpl_toolkits/index.rst

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,26 @@ level interface for drawing statistical graphics with matplotlib. It
172172
aims to make visualization a central part of exploring and
173173
understanding complex datasets.
174174

175+
.. image:: /_static/seaborn.png
176+
:height: 157px
177+
178+
.. _toolkit_holoviews:
179+
180+
holoviews
181+
=========
182+
(*Not distributed with matplotlib*)
183+
184+
`holoviews <http://holoviews.org>`_ makes it easier to visualize data
185+
interactively, especially in a `Jupyter notebook
186+
<http://jupyter.org>`_, by providing a set of declarative
187+
plotting objects that store your data and associated metadata. Your
188+
data is then immediately visualizable alongside or overlaid with other
189+
data, either statically or with automatically provided widgets for
190+
parameter exploration.
191+
192+
.. image:: /_static/holoviews.png
193+
:height: 354px
194+
175195
.. _toolkit_ggplot:
176196

177197
ggplot
@@ -181,6 +201,9 @@ ggplot
181201
`ggplot <https://github.com/yhat/ggplot>`_ is a port of the R ggplot2
182202
to python based on matplotlib.
183203

204+
.. image:: /_static/ggplot.png
205+
:height: 195px
206+
184207

185208
.. _toolkit_prettyplotlib:
186209

‎lib/matplotlib/axis.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ def _apply_params(self, **kw):
342342
# -> points. grab the integer from the `Text` object
343343
# instead of saving the string representation
344344
v = getattr(self.label1, 'get_' + k)()
345-
setattr(self, '_' + k, v)
345+
setattr(self, '_label' + k, v)
346346

347347

348348
class XTick(Tick):

‎lib/matplotlib/collections.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ def set_linestyle(self, ls):
510510
=========================== =================
511511
``'-'`` or ``'solid'`` solid line
512512
``'--'`` or ``'dashed'`` dashed line
513-
``'-.'`` or ``'dash_dot'`` dash-dotted line
513+
``'-.'`` or ``'dashdot'`` dash-dotted line
514514
``':'`` or ``'dotted'`` dotted line
515515
=========================== =================
516516

‎lib/matplotlib/lines.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1012,7 +1012,7 @@ def set_linestyle(self, ls):
10121012
=========================== =================
10131013
``'-'`` or ``'solid'`` solid line
10141014
``'--'`` or ``'dashed'`` dashed line
1015-
``'-.'`` or ``'dash_dot'`` dash-dotted line
1015+
``'-.'`` or ``'dashdot'`` dash-dotted line
10161016
``':'`` or ``'dotted'`` dotted line
10171017
``'None'`` draw nothing
10181018
``' '`` draw nothing

0 commit comments

Comments
 (0)
0