8000 Merge branch 'matplotlib/v1.4.3-doc' · matplotlib/matplotlib@69a1908 · GitHub
[go: up one dir, main page]
Skip to content < 8000 div data-target="react-partial.reactRoot">

Commit 69a1908

Browse files
tacaswelltacaswell
committed
Merge branch 'matplotlib/v1.4.3-doc'
To pick up documentation changes - resolved testing.rst conflicts in favor of master - resolved resources/index.rst in favor of master - resolved github_stats.rst in favor of master
2 parents 66dd16f + afb6e30 commit 69a1908

File tree

4 files changed

+47
-0
lines changed

4 files changed

+47
-0
lines changed

‎doc/_templates/citing.html

Lines changed: 1 addition & 0 deletions
< 8000 td data-grid-cell-id="diff-2f58fc090519d32105be05bfad4acc64db9f260bf5d309b4043965037fbb9fda-30-31-0" data-selected="false" role="gridcell" style="background-color:var(--diffBlob-additionNum-bgColor, var(--diffBlob-addition-bgColor-num));text-align:center" tabindex="-1" valign="top" class="focusable-grid-cell diff-line-number position-relative left-side">
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ <h1>Citing matplotlib</h1>
2828

2929
<h2>DOIs</h2>
3030
<dl>
31+
<dt>v1.4.3</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.15423"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.15423.svg" alt="10.5281/zenodo.15423"></a></dd>
3132
<dt>v1.4.2</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.12400"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.12400.png" alt="10.5281/zenodo.12400"></a></dd>
3233
<dt>v1.4.1</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.12287"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.12287.png" alt="10.5281/zenodo.12287"></a></dd>
3334
<dt>v1.4.0</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.11451"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.11451.png" alt="10.5281/zenodo.11451"></a></dd>

‎doc/_templates/layout.html

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

175175
</head>
176176
<body>
177+
<div class="alert" style="background-color: #FEA46C; padding: 10px 0;
178+
">
179+
<h3>We're updating the default styles for Matplotlib 2.0</h3>
180+
181+
<p>Learn what to expect in the <a href="/style_changes.html" style="font-weight: bold;
182+
color: #11557C;">new updates</a></p>
183+
184+
</div>
177185
{%- block header %}{% endblock %}
178186

179187
{% block relbar1 %}

‎doc/contents.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Overview
1414
.. toctree::
1515
:maxdepth: 2
1616

17+
style_changes.rst
1718
users/index.rst
1819
faq/index.rst
1920
resources/index.rst

‎doc/style_changes.rst

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
Default Style Changes
2+
=====================
3+
4+
Colormap
5+
--------
6+
7+
``matplotlib`` is changing the default colormap and styles in the
8+
upcoming 2.0 release!
9+
10+
The new default color map will be 'viridis' (aka `option
11+
D <http://bids.github.io/colormap/>`_). For an introduction to color
12+
theory and how 'viridis' was generated watch Nathaniel Smith and
13+
Stéfan van der Walt's talk from SciPy2015
14+
15+
.. raw:: html
16+
17+
<iframe width="560" height="315" src="https://www.youtube.com/embed/xAoljeRJ3lU" frameborder="0" allowfullscreen></iframe>
18+
19+
All four color maps will be included in matplotlib 1.5.
20+
21+
22+
Everything Else
23+
---------------
24+
25+
We are soliciting proposals to change any and all visual defaults
26+
(including adding new rcParams as needed).
27+
28+
If you have a proposal please create an issue or PR on `github <https://github.com/matplotlib/matplotlib/issues/new>`_ with the
29+
changes to `rcsetup.py` and `matplotlibrc.template` by August 9, 2015.
30+
31+
In the second week of August, Michael Droettboom and Thomas Caswell
32+
will decide on the new default styles, with the release of 2.0 by the
33+
beginning of September 2015.
34+
35+
A 'classic' style sheet will be provided so reverting to the 1.x
36+
default values will be a single line of python
37+
(`mpl.style.use('classic')`).

0 commit comments

Comments
 (0)
0