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

Skip to content

Commit 109f252

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents b7fdc9b + 9f891c6 commit 109f252

231 files changed

Lines changed: 2676 additions & 2428 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.flake8

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ per-file-ignores =
257257
examples/user_interfaces/mpl_with_glade3_sgskip.py: E402
258258
examples/user_interfaces/pylab_with_gtk_sgskip.py: E302, E402
259259
examples/user_interfaces/toolmanager_sgskip.py: E402
260+
examples/userdemo/connectionstyle_demo.py: E402
260261
examples/userdemo/custom_boxstyle01.py: E402
261262
examples/userdemo/pgf_preamble_sgskip.py: E402
262263
examples/userdemo/simple_annotate01.py: E501

doc/api/animation_api.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ The easiest way to make a live animation in matplotlib is to use one of the
2121
:toctree: _as_gen
2222
:nosignatures:
2323

24+
Animation
2425
FuncAnimation
2526
ArtistAnimation
2627

doc/api/api_changes.rst

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,38 @@
33
API Changes
44
===========
55

6-
A log of changes to the most recent version of Matplotlib that affect the
7-
outward-facing API. If updating Matplotlib breaks your scripts, this list may
8-
help you figure out what caused the breakage and how to fix it by updating
9-
your code. For API changes in older versions see :doc:`api_changes_old`.
6+
If updating Matplotlib breaks your scripts, this list may help you figure out
7+
what caused the breakage and how to fix it by updating your code.
108

11-
For new features that were added to Matplotlib, see :ref:`whats-new`.
12-
13-
This pages lists API changes for the most recent version of Matplotlib.
9+
For API changes in older versions see
1410

1511
.. toctree::
1612
:maxdepth: 1
1713

1814
api_changes_old
1915

16+
Changes for the latest version are listed below. For new features that were
17+
added to Matplotlib, see :ref:`whats-new`.
2018

21-
.. note::
19+
.. ifconfig:: releaselevel == 'dev'
2220

23-
The list below is a table of contents of individual files from the
24-
'next_api_changes' folder.
21+
.. note::
2522

26-
When a release is made
23+
The list below is a table of contents of individual files from the
24+
'next_api_changes' folder.
2725

28-
- The full text list below should be moved into its own file in
29-
'prev_api_changes'
30-
- All the files in 'next_api_changes' should be moved to the bottom of this page
31-
- This note, and the toctree below should be commented out
26+
When a release is made
3227

28+
- All the files in 'next_api_changes/' should be moved to a single file in
29+
'prev_api_changes/'.
30+
- The include directive below should be changed to point to the new file
31+
created in the previous step.
3332

34-
.. toctree::
35-
:glob:
36-
:maxdepth: 1
3733

38-
next_api_changes/*
34+
.. toctree::
35+
:glob:
36+
:maxdepth: 1
37+
38+
next_api_changes/*
39+
40+
.. include:: prev_api_changes/api_changes_3.1.0.rst

doc/api/axis_api.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ Formatters and Locators
6161
Axis.set_minor_formatter
6262
Axis.set_minor_locator
6363

64+
Axis.remove_overlapping_locs
65+
Axis.get_remove_overlapping_locs
66+
Axis.set_remove_overlapping_locs
6467

6568
Axis Label
6669
----------

doc/api/matplotlib_configuration_api.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,5 @@
3333
.. autofunction:: interactive
3434

3535
.. autofunction:: is_interactive
36+
37+
.. autofunction:: set_loglevel

doc/api/next_api_changes/2017-10-24-DS.rst

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

doc/api/next_api_changes/2018-01-03-AL.rst

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

doc/api/next_api_changes/2018-01-07-AL.rst

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

doc/api/next_api_changes/2018-01-08-AL.rst

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

doc/api/next_api_changes/2018-01-09-AL.rst

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

0 commit comments

Comments
 (0)