Skip to content

Commit 28ba3c7

Browse files
authored
Merge branch 'master' into issue_8946
2 parents 4792710 + 34f99a9 commit 28ba3c7

File tree

122 files changed

+936
-1596
lines changed

Some content is hidden

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

122 files changed

+936
-1596
lines changed

.coveragerc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ omit = matplotlib/_version.py
77

88
[report]
99
exclude_lines =
10+
pragma: no cover
1011
raise NotImplemented
1112
def __str__
1213
def __repr__

.github/CODE_OF_CONDUCT.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Matplotlib follows the Python Software Foundation Code of Conduct in everything we do,
2+
see https://www.python.org/psf/conduct/.

doc/api/figure_api.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ Classes
1616
:template: autosummary.rst
1717
:nosignatures:
1818

19-
AxesStack
2019
Figure
2120
SubplotParams
2221

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
``mplot3d.art3d.get_dir_vector`` always returns NumPy arrays
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
4+
For consistency, `~.mplot3d.art3d.get_dir_vector` now always returns NumPy
5+
arrays, even if the input is a 3-element iterable.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
``ScalarFormatter`` *useLocale* option obeys grouping
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
4+
When the `~.ScalarFormatter` option *useLocale* is enabled (or
5+
:rc:`axes.formatter.use_locale` is *True*) and the configured locale uses
6+
grouping, a separator will be added as described in `locale.format_string`.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
*minimumdescent* parameter/property of ``TextArea``
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
`.offsetbox.TextArea` has behaved as if *minimumdescent* was always True
4+
(regardless of the value to which it was set) since Matplotlib 1.3, so the
5+
parameter/property is deprecated.
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
GTK
2+
~~~
3+
4+
The following methods and properties have been removed:
5+
6+
* ``ConfigureSubplotsGTK3.destroy`` method
7+
* ``ConfigureSubplotsGTK3.init_window`` method
8+
* ``ConfigureSubplotsGTK3.window`` property
9+
10+
WX
11+
~~
12+
``FigureFrameWx.statusbar``, ``NavigationToolbar2Wx.set_status_bar``, and
13+
``NavigationToolbar2Wx.statbar`` have been removed. The status bar can be
14+
retrieved by calling standard wx methods (``frame.GetStatusBar()`` and
15+
``toolbar.GetTopLevelParent().GetStatusBar()``).
16+
17+
``backend_wx.ConfigureSubplotsWx.configure_subplots`` and
18+
``backend_wx.ConfigureSubplotsWx.get_canvas`` have been removed.
19+
20+
PGF
21+
~~~
22+
``backend_pgf.repl_escapetext`` and ``backend_pgf.repl_mathdefault`` have been
23+
removed.
24+
25+
``RendererPgf.latexManager`` has been removed.
26+
27+
FigureCanvas
28+
~~~~~~~~~~~~
29+
``FigureCanvasBase.draw_cursor`` and ``FigureCanvasMac.invalidate`` have been
30+
removed.
31+
32+
The ``dryrun`` parameter to the various ``FigureCanvasFoo.print_foo`` methods
33+
has been removed.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Fonts
2+
~~~~~
3+
``font_manager.JSONEncoder`` has been removed. Use `.font_manager.json_dump` to
4+
dump a `.FontManager` instance.
5+
6+
``font_manager.createFontList`` has been removed. `.font_manager.FontManager.addfont`
7+
is now available to register a font at a given path.
8+
9+
The ``as_str``, ``as_rgba_str``, ``as_array``, ``get_width`` and ``get_height``
10+
methods of ``matplotlib.ft2font.FT2Image`` have been removed. Convert the
11+
``FT2Image`` to a NumPy array with ``np.asarray`` before processing it.
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
``matplotlib.mlab``
2+
~~~~~~~~~~~~~~~~~~~
3+
``mlab.apply_window`` and ``mlab.stride_repeat`` have been removed.
4+
5+
Axes3D
6+
~~~~~~
7+
``axes3d.unit_bbox`` has been removed; use ``Bbox.unit`` instead.
8+
9+
axisartist
10+
~~~~~~~~~~
11+
``mpl_toolkits.axisartist.grid_finder.GridFinderBase`` has been removed; use
12+
`.GridFinder` instead.
13+
14+
``axisartist.axis_artist.BezierPath`` has been removed; use
15+
`.patches.PathPatch` instead.
16+
17+
Returning a factor equal to None from axisartist Locators (which are **not**
18+
the same as "standard" tick Locators), or passing a factor equal to None
19+
to axisartist Formatters (which are **not** the same as "standard" tick
20+
Formatters) is no longer supported. Pass a factor equal to 1 instead.
21+
22+
Misc
23+
~~~~
24+
``matplotlib.get_home`` has been removed; use standard library instead.
25+
26+
``matplotlib.compare_versions`` has been removed; use comparison of
27+
``distutils.version.LooseVersion``\s instead.
28+
29+
``matplotlib.checkdep_ps_distiller`` has been removed.
30+
31+
``matplotlib.figure.AxesStack`` has been removed.
32+
33+
``BboxBase.is_unit`` has been removed; check the `.Bbox` extents if needed.
34+
35+
``Affine2DBase.matrix_from_values(...)`` has been removed; use (for example)
36+
``Affine2D.from_values(...).get_matrix()`` instead.
37+
38+
``style.core.is_style_file`` and ``style.core.iter_style_files`` have been
39+
removed.

doc/api/prev_api_changes/api_changes_2.1.0.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ a previous axes instance currently reuses the earlier instance. This
329329
behavior has been deprecated in Matplotlib 2.1. In a future version, a
330330
*new* instance will always be created and returned. Meanwhile, in such
331331
a situation, a deprecation warning is raised by
332-
:class:`~matplotlib.figure.AxesStack`.
332+
``matplotlib.figure.AxesStack``.
333333

334334
This warning can be suppressed, and the future behavior ensured, by passing
335335
a *unique* label to each axes instance. See the docstring of

0 commit comments

Comments
 (0)