Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 2ccb939

Browse filesBrowse files
tacaswelltacaswell
committed
Merge remote-tracking branch 'origin/v3.1.x'
Resolved all conflicts in favor of the master branch except for the changes to doc/api/prev_api_changes/api_changes_3.1.0.rst pcolorfast was updating to take RGB(A) in some cases in PR #8690 / 94b0bca that was backported to v3.1.x via #13709 / afc4e61 . However, the functionality was further extended in #13986 / c05537d which was not backported. When merging v3.1.x into master special care had to be taken to not pull the removed code back into master.
2 parents d062859 + 13f8d86 commit 2ccb939
Copy full SHA for 2ccb939
Expand file treeCollapse file tree

8 files changed

+78
-75
lines changed

‎.flake8

Copy file name to clipboardExpand all lines: .flake8
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ per-file-ignores =
236236
examples/subplots_axes_and_figures/zoom_inset_axes.py: E402
237237
examples/tests/backend_driver_sgskip.py: E402, E501
238238
examples/text_labels_and_annotations/annotation_demo.py: E501
239-
examples/text_labels_and_annotations/demo_text_rotation_mode.py: E402
239+
examples/text_labels_and_annotations/demo_text_rotation_mode.py: E402
240240
examples/text_labels_and_annotations/custom_legends.py: E402
241241
examples/text_labels_and_annotations/font_family_rc_sgskip.py: E402
242242
examples/text_labels_and_annotations/font_file.py: E402
@@ -246,7 +246,7 @@ per-file-ignores =
246246
examples/text_labels_and_annotations/tex_demo.py: E402
247247
examples/text_labels_and_annotations/watermark_text.py: E402
248248
examples/ticks_and_spines/auto_ticks.py: E501
249-
examples/ticks_and_spines/date_concise_formatter.py: E402
249+
examples/ticks_and_spines/date_concise_formatter.py: E402
250250
examples/user_interfaces/canvasagg.py: E402
251251
examples/user_interfaces/embedding_in_gtk3_panzoom_sgskip.py: E402
252252
examples/user_interfaces/embedding_in_gtk3_sgskip.py: E402

‎doc/api/api_changes/171014-AL-tickprops.rst

Copy file name to clipboardExpand all lines: doc/api/api_changes/171014-AL-tickprops.rst
-13Lines changed: 0 additions & 13 deletions
This file was deleted.

‎doc/api/api_changes/2018-08-17-AL-deprecations.rst

Copy file name to clipboardExpand all lines: doc/api/api_changes/2018-08-17-AL-deprecations.rst
-9Lines changed: 0 additions & 9 deletions
This file was deleted.

‎doc/api/api_changes/2018-10-08-AL-deprecations.rst

Copy file name to clipboardExpand all lines: doc/api/api_changes/2018-10-08-AL-deprecations.rst
-5Lines changed: 0 additions & 5 deletions
This file was deleted.

‎doc/api/api_changes/2018-10-09-AL-deprecations.rst

Copy file name to clipboardExpand all lines: doc/api/api_changes/2018-10-09-AL-deprecations.rst
-5Lines changed: 0 additions & 5 deletions
This file was deleted.

‎doc/api/api_changes/2018-10-10-AL.rst

Copy file name to clipboardExpand all lines: doc/api/api_changes/2018-10-10-AL.rst
-9Lines changed: 0 additions & 9 deletions
This file was deleted.

‎doc/api/api_changes/2018-12-20-AL-deprecations.rst

Copy file name to clipboardExpand all lines: doc/api/api_changes/2018-12-20-AL-deprecations.rst
-30Lines changed: 0 additions & 30 deletions
This file was deleted.

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

Copy file name to clipboardExpand all lines: doc/api/prev_api_changes/api_changes_3.1.0.rst
+76-2Lines changed: 76 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,13 @@ with nonfinite values are plotted using the bad color of the
4141
`.collections.PathCollection`\ 's colormap (as set by
4242
:meth:`.colors.Colormap.set_bad`).
4343

44+
Alpha blending in imshow of RBGA input
45+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
46+
47+
The alpha-channel of RBGA images is now re-sampled independently of
48+
RGB channels. While this is a bug fix, it does change the output and
49+
may result in some down-stream image comparison tests to fail.
50+
4451
Autoscaling
4552
~~~~~~~~~~~
4653
On log-axes where a single value is plotted at a "full" decade (1, 10, 100,
@@ -404,6 +411,26 @@ non-callable), the exception would be silently ignored and the default
404411
formatter be used instead. This is no longer the case; the exception
405412
is now propagated out.
406413

414+
Deprecation of redundant `Tick` attributes
415+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
416+
417+
The ``gridOn``, ``tick1On``, ``tick2On``, ``label1On``, and ``label2On``
418+
`~.Tick` attributes have been deprecated. Directly get and set the visibility
419+
on the underlying artists, available as the ``gridline``, ``tick1line``,
420+
``tick2line``, ``label1``, and ``label2`` attributes.
421+
422+
The ``label`` attribute, which was an alias for ``label1``, has been
423+
deprecated.
424+
425+
Subclasses that relied on setting the above visibility attributes needs to be
426+
updated; see e.g. :file:`examples/api/skewt.py`.
427+
428+
Passing a Line2D's drawstyle together with the linestyle is deprecated
429+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
430+
431+
Instead of ``plt.plot(..., linestyle="steps--")``, use ``plt.plot(...,
432+
linestyle="--", drawstyle="steps")``. ``ds`` is now an alias for ``drawstyle``.
433+
407434

408435
``pgi`` support dropped
409436
-----------------------
@@ -454,6 +481,12 @@ Exception changes
454481
a `RuntimeError` if they were called with a ``data`` kwarg and
455482
otherwise mismatched arguments. They now raise a `TypeError`
456483
instead.
484+
- `.Axes.streamplot` does not support irregularly gridded ``x`` and ``y`` values.
485+
So far, it used to silently plot an incorrect result. This has been changed to
486+
raise a `ValueError` instead.
487+
- The `.streamplot.Grid` class, which is internally used by streamplot
488+
code, also throws a `ValueError` when irregularly gridded values are
489+
passed in.
457490

458491
Removals
459492
--------
@@ -842,6 +875,37 @@ future version.
842875
- `.cbook.is_hashable`
843876
Use ``isinstance(..., collections.abc.Hashable)`` instead.
844877

878+
- The `.backend_bases.RendererBase.strip_math`. Use
879+
`.cbook.strip_math` instead.
880+
881+
Multiple internal functions that were exposed as part of the public API
882+
of `.mpl_toolkits.mplot3d` are deprecated,
883+
884+
**mpl_toolkits.mplot3d.art3d**
885+
886+
- :func:`mpl_toolkits.mplot3d.art3d.norm_angle`
887+
- :func:`mpl_toolkits.mplot3d.art3d.norm_text_angle`
888+
- :func:`mpl_toolkits.mplot3d.art3d.path_to_3d_segment`
889+
- :func:`mpl_toolkits.mplot3d.art3d.paths_to_3d_segments`
890+
- :func:`mpl_toolkits.mplot3d.art3d.path_to_3d_segment_with_codes`
891+
- :func:`mpl_toolkits.mplot3d.art3d.paths_to_3d_segments_with_codes`
892+
- :func:`mpl_toolkits.mplot3d.art3d.get_patch_verts`
893+
- :func:`mpl_toolkits.mplot3d.art3d.get_colors`
894+
- :func:`mpl_toolkits.mplot3d.art3d.zalpha`
895+
896+
**mpl_toolkits.mplot3d.proj3d**
897+
898+
- :func:`mpl_toolkits.mplot3d.proj3d.line2d`
899+
- :func:`mpl_toolkits.mplot3d.proj3d.line2d_dist`
900+
- :func:`mpl_toolkits.mplot3d.proj3d.line2d_seg_dist`
901+
- :func:`mpl_toolkits.mplot3d.proj3d.mod`
902+
- :func:`mpl_toolkits.mplot3d.proj3d.proj_transform_vec`
903+
- :func:`mpl_toolkits.mplot3d.proj3d.proj_transform_vec_clip`
904+
- :func:`mpl_toolkits.mplot3d.proj3d.vec_pad_ones`
905+
- :func:`mpl_toolkits.mplot3d.proj3d.proj_trans_clip_points`
906+
907+
If your project relies on these functions, consider vendoring them.
908+
845909

846910
Font Handling
847911
~~~~~~~~~~~~~
@@ -907,8 +971,10 @@ GUI / backend details
907971
as it is a module-level global, no deprecation warning is emitted when
908972
accessing it).
909973
- `.mlab.demean`
910-
911-
974+
- ``backend_gtk3cairo.FigureCanvasGTK3Cairo``,
975+
- ``backend_wx.debug_on_error``, ``backend_wx.fake_stderr``,
976+
``backend_wx.raise_msg_to_str``, ``backend_wx.MenuButtonWx``,
977+
``backend_wx.PrintoutWx``,
912978
- ``matplotlib.backends.qt_editor.formlayout`` module
913979

914980
This module is a vendored, modified version of the official formlayout_ module
@@ -1067,6 +1133,14 @@ updated to use `~.Formatter.format_ticks`.
10671133
subclasses for which the formatting of a tick value depends on other tick
10681134
values, such as `.ConciseDateFormatter`.
10691135

1136+
Added support for RGB(A) images in pcolorfast
1137+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1138+
1139+
pcolorfast now accepts 3D images (RGB or RGBA) arrays if the X and Y
1140+
specifications allow image or pcolorimage rendering; they remain unsupported by
1141+
the more general quadmesh rendering
1142+
1143+
10701144
Invalid inputs
10711145
--------------
10721146

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.