Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e39dfa5

Browse files
tacaswelltacaswell
committed
Merge remote-tracking branch 'matplotlib/v2.x'
Changes from doc/mpl_toolkits/index.rst needed to be moved to doc/thirdpartypackages/index.rst by hand. Conflicts: doc/_templates/index.html doc/mpl_toolkits/index.rst
2 parents 579d95a + 732efa3 commit e39dfa5

File tree

8 files changed

+30
-5
lines changed

8 files changed

+30
-5
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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,11 @@ <h1>Toolkits</h1>
167167
<h1>Third party packages</h1>
168168

169169
<p>A large number of third party <a href="{{ pathto('mpl_toolkits/index') }}">packages</a>
170-
extend and build on Matplotlib functionality,
171-
including a choice of two projection and mapping toolkits
170+
extend and build on Matplotlib functionality. This includes several higher-level plotting interfaces;
171+
<a href="http://web.stanford.edu/~mwaskom/software/seaborn">seaborn</a>,
172+
<a href="http://holoviews.org">holoviews</a>,
173+
<a href="http://ggplot.yhathq.com">ggplot</a>, and
174+
two projection and mapping toolkits
172175
<a href="http://matplotlib.org/basemap">basemap</a> and
173176
<a href="http://scitools.org.uk/cartopy/docs/latest">cartopy</a>.
174177
</p>

‎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
@@ -214,6 +214,8 @@
214214
# Output file base name for HTML help builder.
215215
htmlhelp_basename = 'Matplotlibdoc'
216216

217+
# Path to favicon
218+
html_favicon = '_static/favicon.ico'
217219

218220
# Options for LaTeX output
219221
# ------------------------

‎doc/mpl_toolkits/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ axisartist
5151
==========
5252

5353

54-
The :ref:`mpl_toolkits.axisartist <toolkit_axisartist-index>` toolkit contains
54+
The :ref:`mpl_toolkits.axisartist <toolkit_axisartist-index>` toolkit contains
5555
a custom Axes class that is meant to support for curvilinear grids.
5656

5757

‎doc/thirdpartypackages/index.rst

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ level interface for drawing statistical graphics with matplotlib. It
6767
aims to make visualization a central part of exploring and
6868
understanding complex datasets.
6969

70+
.. image:: /_static/seaborn.png
71+
:height: 157px
72+
7073
.. _toolkit_ggplot:
7174

7275
ggplot
@@ -75,6 +78,25 @@ ggplot
7578
`ggplot <https://github.com/yhat/ggplot>`_ is a port of the R ggplot2
7679
to python based on matplotlib.
7780

81+
.. image:: /_static/ggplot.png
82+
:height: 195px
83+
84+
.. _toolkit_holoviews:
85+
86+
holoviews
87+
=========
88+
89+
90+
`holoviews <http://holoviews.org>`_ makes it easier to visualize data
91+
interactively, especially in a `Jupyter notebook
92+
<http://jupyter.org>`_, by providing a set of declarative
93+
plotting objects that store your data and associated metadata. Your
94+
data is then immediately visualizable alongside or overlaid with other
95+
data, either statically or with automatically provided widgets for
96+
parameter exploration.
97+
98+
.. image:: /_static/holoviews.png
99+
:height: 354px
78100

79101
.. _toolkit_prettyplotlib:
80102

0 commit comments

Comments
 (0)