Skip to content

Commit eca42b6

Browse files
tacaswelltacaswell
committed
Merge branch 'v3.1.x'
 Conflicts: .appveyor.yml doc/faq/index.rst doc/faq/virtualenv_faq.rst lib/matplotlib/__init__.py lib/matplotlib/axes/_base.py lib/matplotlib/backends/backend_qt5.py lib/matplotlib/cbook/__init__.py lib/matplotlib/colors.py lib/matplotlib/figure.py lib/matplotlib/gridspec.py lib/matplotlib/offsetbox.py lib/matplotlib/quiver.py lib/matplotlib/rcsetup.py lib/matplotlib/tests/test_axes.py lib/matplotlib/tests/test_backend_svg.py lib/matplotlib/tests/test_colors.py lib/matplotlib/tests/test_image.py lib/matplotlib/tests/test_quiver.py lib/matplotlib/tests/test_scale.py lib/matplotlib/tests/test_units.py lib/mpl_toolkits/mplot3d/axes3d.py matplotlibrc.template setup.py Kept master branch version in all cases. Manually updated the doc/missing-references.json on top of the merge.
2 parents 662bb8c + 6665d1f commit eca42b6

File tree

20 files changed

+2010
-1252
lines changed

20 files changed

+2010
-1252
lines changed

‎doc/_templates/donate_sidebar.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11

2+
3+
24
<div id="sidebar-donations">
3-
<a href="https://www.flipcause.com/secure/cause_pdetails/MjI1OA==" target="_blank"> <div class="donate_button" >Support Matplotlib</div></a>
4-
<a href="https://www.flipcause.com/secure/cause_pdetails/MTY3NTU=" target="_blank"> <div class="donate_button" >Support NumFOCUS</div></a>
5+
<a href="https://numfocus.salsalabs.org/donate-to-matplotlib/index.html" target="_blank"> <div class="donate_button" >Support Matplotlib</div></a>
56
</div>

‎doc/api/api_changes.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,5 @@ added to Matplotlib, see :ref:`whats-new`.
3737

3838
next_api_changes/*
3939

40+
.. include:: prev_api_changes/api_changes_3.1.1.rst
4041
.. include:: prev_api_changes/api_changes_3.1.0.rst

‎doc/api/prev_api_changes/api_changes_3.1.1.rst‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
API Changes for 3.1.1
2+
=====================
3+
4+
.. contents::
5+
:local:
6+
:depth: 1
7+
8+
Behavior changes
9+
----------------
10+
11+
Locator.nonsingular return order
12+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
13+
14+
`Locator.nonsingular` (introduced in mpl 3.1) now returns a range ``v0, v1``
15+
with ``v0 <= v1``. This behavior is consistent with the implementation of
16+
``nonsingular`` by the `LogLocator` and `LogitLocator` subclasses.

‎doc/citing.rst‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,30 @@ pp. 90-95, 2007 <https://doi.org/10.1109/MCSE.2007.55>`_.
2727
2828
DOIs
2929
----
30+
v3.1.1
31+
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3264781.svg
32+
:target: https://doi.org/10.5281/zenodo.3264781
33+
v3.1.0
34+
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.2893252.svg
35+
:target: https://doi.org/10.5281/zenodo.2893252
36+
v3.0.3
37+
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.2577644.svg
38+
:target: https://doi.org/10.5281/zenodo.2577644
39+
v3.0.2
40+
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1482099.svg
41+
:target: https://doi.org/10.5281/zenodo.1482099
42+
v3.0.1
43+
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1482098.svg
44+
:target: https://doi.org/10.5281/zenodo.1482098
3045
v3.0.0
3146
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1420605.svg
3247
:target: https://doi.org/10.5281/zenodo.1420605
48+
v2.2.4
49+
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.2669103.svg
50+
:target: https://doi.org/10.5281/zenodo.2669103
51+
v2.2.3
52+
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1343133.svg
53+
:target: https://doi.org/10.5281/zenodo.1343133
3354
v2.2.2
3455
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1202077.svg
3556
:target: https://doi.org/10.5281/zenodo.1202077

‎doc/devel/documenting_mpl.rst‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -902,8 +902,7 @@ Some helpful functions::
902902
.. _ReST: http://docutils.sourceforge.net/rst.html
903903
.. _Sphinx: http://www.sphinx-doc.org
904904
.. _documentation: https://www.sphinx-doc.org/en/master/contents.html
905-
.. _`inline markup`: http://www.sphinx-doc.org/markup/inline.html
906905
.. _index: http://www.sphinx-doc.org/markup/para.html#index-generating-markup
907906
.. _`Sphinx Gallery`: https://sphinx-gallery.readthedocs.io/en/latest/
908-
.. _references: http://www.sphinx-doc.org/en/stable/markup/inline.html
907+
.. _references: https://www.sphinx-doc.org/en/stable/usage/restructuredtext/roles.html
909908
.. _`numpydoc docstring guide`: https://numpydoc.readthedocs.io/en/latest/format.html

‎doc/devel/gitwash/git_links.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
.. _deleting master on github: https://matthew-brett.github.io/pydagogue/gh_delete_master.html
5050
.. _rebase without tears: https://matthew-brett.github.io/pydagogue/rebase_without_tears.html
5151
.. _resolving a merge: https://schacon.github.io/git/user-manual.html#resolving-a-merge
52-
.. _ipython git workflow: https://mail.scipy.org/pipermail/ipython-dev/2010-October/006746.html
52+
.. _ipython git workflow: https://mail.python.org/pipermail/ipython-dev/2010-October/005632.html
5353

5454
.. other stuff
5555
.. _python: https://www.python.org

‎doc/index.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ Please consider `donating to the Matplotlib project <donating_>`_ through
186186
the Numfocus organization or to the `John Hunter Technology Fellowship
187187
<jdh-fellowship_>`_.
188188

189-
.. _donating: https://www.flipcause.com/secure/cause_pdetails/MjI1OA==
189+
.. _donating: https://numfocus.salsalabs.org/donate-to-matplotlib/index.html
190190
.. _jdh-fellowship: https://www.numfocus.org/programs/john-hunter-technology-fellowship/
191191

192192
The :doc:`Matplotlib license <users/license>` is based on the `Python Software

‎doc/missing-references.json‎

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -885,6 +885,17 @@
885885
"MovieWriter.saving": [
886886
"doc/api/animation_api.rst:213"
887887
],
888+
"Locator.nonsingular": [
889+
"doc/api/prev_api_changes/api_changes_3.1.1.rst:14"
890+
],
891+
"LogLocator": [
892+
"doc/api/prev_api_changes/api_changes_3.0.0.rst:207",
893+
"doc/api/prev_api_changes/api_changes_3.1.0.rst:59",
894+
"doc/api/prev_api_changes/api_changes_3.1.1.rst:14"
895+
],
896+
"LogitLocator": [
897+
"doc/api/prev_api_changes/api_changes_3.1.1.rst:14"
898+
],
888899
"PathCollection.get_offsets": [
889900
"doc/api/prev_api_changes/api_changes_3.1.0.rst:30"
890901
],
@@ -894,10 +905,6 @@
894905
"PathCollection.get_array": [
895906
"doc/api/prev_api_changes/api_changes_3.1.0.rst:30"
896907
],
897-
"LogLocator": [
898-
"doc/api/prev_api_changes/api_changes_3.0.0.rst:207",
899-
"doc/api/prev_api_changes/api_changes_3.1.0.rst:59"
900-
],
901908
"AutoLocator": [
902909
"doc/api/prev_api_changes/api_changes_3.1.0.rst:59"
903910
],
@@ -2509,11 +2516,11 @@
25092516
],
25102517
"GTK3Agg": [
25112518
"doc/api/prev_api_changes/api_changes_2.2.0.rst:285",
2512-
"doc/tutorials/introductory/usage.rst:579"
2519+
"doc/tutorials/introductory/usage.rst:582"
25132520
],
25142521
"GTK3Cairo": [
25152522
"doc/api/prev_api_changes/api_changes_2.2.0.rst:285",
2516-
"doc/tutorials/introductory/usage.rst:579"
2523+
"doc/tutorials/introductory/usage.rst:582"
25172524
],
25182525
"Text.set_text": [
25192526
"doc/api/prev_api_changes/api_changes_3.0.0.rst:64",
@@ -3001,7 +3008,7 @@
30013008
],
30023009
"GTK3": [
30033010
"doc/devel/MEP/MEP23.rst:54",
3004-
"doc/tutorials/introductory/usage.rst:579",
3011+
"doc/tutorials/introductory/usage.rst:582",
30053012
"doc/users/prev_whats_new/whats_new_1.5.rst:620"
30063013
],
30073014
"add_canvas": [
@@ -3477,27 +3484,27 @@
34773484
"doc/tutorials/introductory/usage.rst:176"
34783485
],
34793486
"QT_API": [
3480-
"doc/tutorials/introductory/usage.rst:585"
3487+
"doc/tutorials/introductory/usage.rst:588"
34813488
],
34823489
"pyqt": [
3483-
"doc/tutorials/introductory/usage.rst:585"
3490+
"doc/tutorials/introductory/usage.rst:588"
34843491
],
34853492
"pyside": [
3486-
"doc/tutorials/introductory/usage.rst:585"
3493+
"doc/tutorials/introductory/usage.rst:588"
34873494
],
34883495
"PyQt4": [
3489-
"doc/tutorials/introductory/usage.rst:585",
3490-
"doc/tutorials/introductory/usage.rst:588"
3496+
"doc/tutorials/introductory/usage.rst:588",
3497+
"doc/tutorials/introductory/usage.rst:591"
34913498
],
34923499
"PySide": [
3493-
"doc/tutorials/introductory/usage.rst:585",
3494-
"doc/tutorials/introductory/usage.rst:588"
3500+
"doc/tutorials/introductory/usage.rst:588",
3501+
"doc/tutorials/introductory/usage.rst:591"
34953502
],
34963503
"macosx": [
3497-
"doc/tutorials/introductory/usage.rst:663"
3504+
"doc/tutorials/introductory/usage.rst:666"
34983505
],
34993506
"loc='best'": [
3500-
"doc/tutorials/introductory/usage.rst:869"
3507+
"doc/tutorials/introductory/usage.rst:872"
35013508
],
35023509
"matplotlib.Axes.annotate": [
35033510
"doc/tutorials/text/annotations.rst:88"
@@ -5523,7 +5530,7 @@
55235530
"doc/tutorials/intermediate/artists.rst:219"
55245531
],
55255532
"show": [
5526-
"doc/tutorials/introductory/usage.rst:687"
5533+
"doc/tutorials/introductory/usage.rst:690"
55275534
],
55285535
"matplotlib.Axes.annotate": [
55295536
"doc/tutorials/text/annotations.rst:23"
@@ -5683,7 +5690,7 @@
56835690
],
56845691
"matplotlib": [
56855692
"doc/gallery/text_labels_and_annotations/annotation_demo.rst:14",
5686-
"doc/tutorials/introductory/usage.rst:588"
5693+
"doc/tutorials/introductory/usage.rst:591"
56875694
],
56885695
"matplotlib.patch": [
56895696
"doc/tutorials/advanced/path_tutorial.rst:16"
@@ -5721,4 +5728,4 @@
57215728
"doc/users/prev_whats_new/whats_new_1.5.rst:737"
57225729
]
57235730
}
5724-
}
5731+
}

0 commit comments

Comments
 (0)