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

Skip to content

Commit 20ed033

Browse files
tacaswelltacaswell
committed
Merge remote-tracking branch 'origin/v3.0.x'
Conflicts: - .flake8 - kept master version - doc/api/api_changes.rst - Looks like there were previous merge issue, cleaning up - removed duplicate section on tight_box - mplDeprecation text is lower down - doc/api/next_api_changes/2018-05-15-AL-removals.rst - should exist on master - doc/users/whats_new.rst - keep extra sections from 3.0.x branch - lib/matplotlib/__init__.py - keep spelling correction - lib/matplotlib/animation.py - keep mater branch version of ImageMagick writer - lib/matplotlib/artist.py - keep master version - lib/matplotlib/tests/test_backend_qt.py - keep master version - lib/matplotlib/tests/test_backend_qt4.py - removed on master, not retained - lib/matplotlib/tests/test_units.py - whitespace - lib/mpl_toolkits/axes_grid1/axes_size.py - keep master version - setupext.py - master branch version of tcl/tk build notes - src/_backend_agg.cpp - keep master version - tutorials/text/mathtext.py - keep master version
2 parents d85811d + 3de5f14 commit 20ed033

17 files changed

Lines changed: 463 additions & 387 deletions

‎doc/_templates/sidebar_announcement.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="sidebar-announcement">
2-
<p>The upcoming version Matplotlib 3.0 will be Python 3 only.</p>
2+
<p>Matplotlib 3.0 is Python 3 only.</p>
33
<p>For Python 2 support, Matplotlib 2.2.x will be continued as a LTS release
44
and updated with bugfixes until January 1, 2020.</p>
55
</div>

‎doc/api/api_changes.rst‎

Lines changed: 309 additions & 227 deletions
Large diffs are not rendered by default.

‎doc/api/api_changes/2017-09-02-AL-rc-blacklist.rst‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎doc/api/next_api_changes/2018-02-09-ES.rst‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎doc/api/next_api_changes/2018-02-15-AL-deprecations.rst‎

Lines changed: 0 additions & 59 deletions
This file was deleted.

‎doc/api/next_api_changes/2018-04-29-JMK.rst‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎doc/api/next_api_changes/2018-05-06-AL-callbackregistry.rst‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎doc/api/next_api_changes/2018-06-01-PG-pytz-ectomy.rst‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎doc/citing.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ publication, please acknowledge this fact by citing `Hunter et al (2007)
2727
2828
DOIs
2929
----
30+
v3.0.0
31+
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1420605.svg
32+
:target: https://doi.org/10.5281/zenodo.1420605
3033
v2.2.2
3134
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1202077.svg
3235
:target: https://doi.org/10.5281/zenodo.1202077

‎doc/conf.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,3 +329,10 @@ def _check_deps():
329329
# numpydoc config
330330

331331
numpydoc_show_class_members = False
332+
333+
latex_engine = 'xelatex' # or 'lualatex'
334+
335+
latex_elements = {
336+
'babel': r'\usepackage{babel}',
337+
'fontpkg': r'\setmainfont{DejaVu Serif}',
338+
}

0 commit comments

Comments
 (0)