Skip to content

Commit 4b98735

Browse files
paalgepaalge
authored
Merge branch 'master' into pcolorfast
2 parents dea123d + 1a89250 commit 4b98735

File tree

259 files changed

+3511
-24896
lines changed

Some content is hidden

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

259 files changed

+3511
-24896
lines changed

‎.flake8

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ per-file-ignores =
3333
lib/matplotlib/backends/_backend_tk.py: E501
3434
lib/matplotlib/backends/backend_agg.py: E302
3535
lib/matplotlib/backends/backend_cairo.py: E203, E221, E402
36-
lib/matplotlib/backends/backend_gtk3.py: E203, E221, E222, E225, E251, E501
36+
lib/matplotlib/backends/backend_gtk3.py: E203, E221, E225, E251, E501
3737
lib/matplotlib/backends/backend_pgf.py: E731
3838
lib/matplotlib/backends/qt_editor/_formlayout.py: E501
3939
lib/matplotlib/font_manager.py: E203, E221, E251, E501
@@ -230,6 +230,7 @@ per-file-ignores =
230230
examples/subplots_axes_and_figures/zoom_inset_axes.py: E402
231231
examples/tests/backend_driver_sgskip.py: E402, E501
232232
examples/text_labels_and_annotations/annotation_demo.py: E501
233+
examples/text_labels_and_annotations/demo_text_rotation_mode.py: E402
233234
examples/text_labels_and_annotations/custom_legends.py: E402
234235
examples/text_labels_and_annotations/font_family_rc_sgskip.py: E402
235236
examples/text_labels_and_annotations/font_file.py: E402

‎.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,3 +95,8 @@ lib/z.lib
9595
#################
9696

9797
.ipynb_checkpoints/
98+
99+
# Vendored dependencies #
100+
#########################
101+
102+
jquery-ui-*/

‎doc/api/api_changes.rst

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,25 @@ This pages lists API changes for the most recent version of Matplotlib.
1717

1818
api_changes_old
1919

20-
..
2120

22-
.. note::
21+
.. note::
2322

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

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

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
3132

32-
.. toctree::
33-
:glob:
34-
:maxdepth: 1
3533

36-
next_api_changes/*
34+
.. toctree::
35+
:glob:
36+
:maxdepth: 1
37+
38+
next_api_changes/*
3739

3840

3941
API Changes for 3.0.1
@@ -44,6 +46,20 @@ subplotparams will collapse axes to zero width or height. This prevents
4446
``tight_layout`` from being executed. Similarly
4547
`.tight_layout.get_tight_layout_figure` will return None.
4648

49+
To improve import (startup) time, private modules are now imported lazily.
50+
These modules are no longer available at these locations:
51+
52+
- `matplotlib.backends.backend_agg._png`
53+
- `matplotlib.contour._contour`
54+
- `matplotlib.image._png`
55+
- `matplotlib.mathtext._png`
56+
- `matplotlib.testing.compare._png`
57+
- `matplotlib.texmanager._png`
58+
- `matplotlib.tri.triangulation._tri`
59+
- `matplotlib.tri.triangulation._qhull`
60+
- `matplotlib.tri.tricontour._tri`
61+
- `matplotlib.tri.trifinder._tri`
62+
4763
API Changes for 3.0.0
4864
=====================
4965

@@ -154,8 +170,9 @@ Different exception types for undocumented options
154170
and ``right`` arguments. :meth:`~matplotlib.axes.Axes.set_ylim` and the
155171
3D equivalents (e.g. :meth:`~mpl_toolkits.axes.Axes3D.set_zlim3d`) had a
156172
corresponding problem.
157-
The ``_min`` and ``_max`` arguments are now deprecated, and a ``TypeError``
158-
will be raised if they would override the earlier limit arguments.
173+
A ``TypeError`` will be raised if they would override the earlier
174+
limit arguments. In 3.0 these were kwargs were deprecated, but in 3.1
175+
the deprecation was undone.
159176

160177

161178
Improved call signature for ``Axes.margins``

‎doc/api/artist_api.rst

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,6 @@ Interactive
4343
Artist.set_picker
4444
Artist.get_picker
4545

46-
Margins and Autoscaling
47-
-----------------------
48-
49-
.. autosummary::
50-
:toctree: _as_gen
51-
:nosignatures:
52-
53-
Artist.sticky_edges
54-
5546
Clipping
5647
--------
5748

@@ -171,13 +162,16 @@ Metadata
171162
Artist.set_url
172163
Artist.get_url
173164

174-
Stale
175-
-----
165+
Miscellaneous
166+
-------------
176167

177168
.. autosummary::
178169
:toctree: _as_gen
179170
:nosignatures:
180171

172+
Artist.sticky_edges
173+
Artist.set_in_layout
174+
Artist.get_in_layout
181175
Artist.stale
182176

183177
Functions

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
`StemContainer` now stores `LineCollection`
2+
-------------------------------------------
3+
4+
`StemContainer` objects can now store a `LineCollection` object instead of a
5+
list of `Line2D` objects for stem lines plotted using `ax.stem`. This gives a
6+
very large performance boost to displaying and moving `ax.stem` plots.
7+
8+
This will become the default behaviour in Matplotlib 3.3. To use it now, the
9+
``use_line_collection`` keyword argument to ~`.axes.stem` can be set to
10+
``True``.
11+
12+
Individual line segments can be extracted from the `LineCollection` using
13+
`LineCollection.get_segements()`. See the `LineCollection` documentation for
14+
other methods to retrieve the collection properties.

‎doc/api/next_api_changes/2018-01-27-AL.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Deprecations
2+
````````````
3+
4+
``checkdep_dvipng``, ``checkdep_ghostscript``, ``checkdep_pdftops``, and
5+
``checkdep_inkscape`` are deprecated.

‎doc/api/next_api_changes/2018-01-28-AL.rst

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,13 @@ New `Formatter.format_ticks` method
44
The `Formatter` class gained a new `~Formatter.format_ticks` method, which
55
takes the list of all tick locations as a single argument and returns the list
66
of all formatted values. It is called by the axis tick handling code and, by
7-
default, repeatedly calls `~Formatter.__call__`.
7+
default, first calls `~Formatter.set_locs` with all locations, then repeatedly
8+
calls `~Formatter.__call__` for each location.
89

9-
It is intended to be overridden by `Formatter` subclasses for which
10-
the formatting of a tick value depends on other tick values, such as
11-
`ConciseDateFormatter`.
10+
Tick-handling code in the codebase that previously performed this sequence
11+
(`~Formatter.set_locs` followed by repeated `~Formatter.__call__`) have been
12+
updated to use `~Formatter.format_ticks`.
13+
14+
`~Formatter.format_ticks` is intended to be overridden by `Formatter`
15+
subclasses for which the formatting of a tick value depends on other tick
16+
values, such as `ConciseDateFormatter`.

‎doc/api/next_api_changes/2018-01-28_tac.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
De-deprecate xmin, xmax kwargs to set_xlim and ymin, ymax kwargs to set_ylim
2+
````````````````````````````````````````````````````````````````````````````
3+
4+
These kwargs were deprecated in 3.0, but due to user feedback and the
5+
semantics of the new names are problematic for non-rectangular axes.

‎doc/api/next_api_changes/2018-01-30-AL.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
Minor Locator no longer try to avoid overstriking major Locators
2+
````````````````````````````````````````````````````````````````
3+
4+
Previously, certain locator classes (`LogLocator`, `AutoMinorLocator`)
5+
contained custom logic to avoid emitting tick locations that collided with
6+
major ticks when they were used as minor locators.
7+
8+
This logic has now moved to the Axis class; thus, for example,
9+
``xaxis.minor.locator()`` now includes positions that collide with
10+
``xaxis.major.locator()``, but ``xaxis.get_minorticklocs()`` does not.

‎doc/api/next_api_changes/2018-02-16-AL.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
API changes
2+
```````````
3+
4+
The ``manage_xticks`` parameter of `~Axes.boxplot` and `~Axes.bxp` has been
5+
renamed (with a deprecation period) to ``manage_ticks``, to take into account
6+
the fact that it manages either x or y ticks depending on the ``vert``
7+
parameter.
8+
9+
When ``manage_ticks`` is True (the default), these methods now attempt to take
10+
previously drawn boxplots into account when setting the axis limits, ticks, and
11+
tick labels.

0 commit comments

Comments
 (0)