Skip to content

Merge branch 'main' into text-overhaul#31408

Merged
QuLogic merged 129 commits into
matplotlib:text-overhaulfrom
QuLogic:text-overhaul-mergeup
Apr 2, 2026
Merged

Merge branch 'main' into text-overhaul#31408
QuLogic merged 129 commits into
matplotlib:text-overhaulfrom
QuLogic:text-overhaul-mergeup

Conversation

@QuLogic
Copy link
Copy Markdown
Member

@QuLogic QuLogic commented Mar 27, 2026

PR summary

There were several conflicts and new images, so just trying to confirm that everything passes everywhere.

AI Disclosure

None

PR checklist

story645 and others added 30 commits March 3, 2026 20:22
Co-authored-by: Tim Hoffmann <[email protected]>
Co-authored-by: Ruth Comer <[email protected]>
Co-authored-by: Scott Shambaugh <[email protected]>
…31133)

* fix: resolve FigureCanvasTkAgg clipping on Windows HiDPI

* Fix lint issues

* Fix update_idletasks call in Tk backend

* Check for update_idletasks existence before calling

* refactor: fix HiDPI clipping for layout-managed FigureCanvasTkAgg by resizing with actual widget dimensions instead of computed ones after DPI changes

* fix: matplot error

* update docstring

---------

Co-authored-by: intelliking <[email protected]>
Co-authored-by: Ubuntu <[email protected]>
…s-reuse-error

API: Raise ValueError in subplots if num refers to existing figure
Co-authored-by: Elliott Sales de Andrade <[email protected]>
SEC: Block shell escapes in latex and ps commands
…origin

MNT: Restrict webagg toolbar actions to valid actions
Introduce a val_in_range method in ScaleBase to explicitly check whether
values lie within the valid domain of a scale. The default
implementation falls back to limit_range_for_scale for compatibility
with existing scales.

Specific scales (e.g., LogScale, LogitScale) override this method with
more efficient checks.
…-doc

DOC: clarify explanation of axline in infinite lines example
timhoffm and others added 13 commits March 29, 2026 13:20
That discussion is out of scope here, and we generally use OO nowadays.
matplotlib#31422)

* Improve legend loc and bbox_to_anchor documentation (matplotlib#26620)

* Update lib/matplotlib/legend.py

Co-authored-by: Tim Hoffmann <[email protected]>

* Update lib/matplotlib/legend.py

Co-authored-by: Tim Hoffmann <[email protected]>

---------

Co-authored-by: Tim Hoffmann <[email protected]>
…llection-legend_elements

MNT: Minor cleanup of label formatting in PathCollection.legend_elements
…_actions/actions-544a40d0fe

Bump the actions group with 2 updates
* Fix: Prevent Cursor blitting from erasing overlapping axes

* Fix styling: remove trailing whitespace and shorten comment

* MAINT: explicitly mark Cursor blitting on overlapping axes as unsupported

* style: fix ruff line length limit in widgets.py

* test: add coverage for cursor overlapping axes warning

* chore: trigger CI to clear Windows timeout flake
* ENH: Support partial figsize with None (matplotlib#31400)

* ENH: disallow None in Figure.set_size_inches

* Update lib/matplotlib/figure.py

Co-authored-by: Tim Hoffmann <[email protected]>

* Update lib/matplotlib/tests/test_figure.py

Co-authored-by: Tim Hoffmann <[email protected]>

* Update lib/matplotlib/tests/test_figure.py

Co-authored-by: Tim Hoffmann <[email protected]>

* Update lib/matplotlib/tests/test_figure.py

Co-authored-by: Tim Hoffmann <[email protected]>

* ENH: parse partial None figsize in _parse_figsize

* Simplify set_size_inches argument handling

* DOC: document partial None support for figsize

* Update doc/release/next_whats_new/partial_figsize_none.rst

Co-authored-by: Tim Hoffmann <[email protected]>

* Update lib/matplotlib/figure.py

Co-authored-by: Tim Hoffmann <[email protected]>

* Update lib/matplotlib/pyplot.py

Co-authored-by: Tim Hoffmann <[email protected]>

---------

Co-authored-by: Tim Hoffmann <[email protected]>
…face

DOC: Remove pyplot vs. OO interface discussion from lifecycle example
Previously, some fontmaps used integer keys for some special font
entries, but there's no reason why they can't also be strings, which
should reduce the type inconsistency across the whole file.

Also, fix a couple of other type errors with strict mypy.

Fixes matplotlib#31433
…s-doc

Clarify SecondaryAxes limit behavior via documentation
@QuLogic QuLogic moved this from Waiting for other PR to Ready for Review in Font and text overhaul Apr 2, 2026
QuLogic added 2 commits April 2, 2026 15:53
- Port FreeType symbol visibility patch to 2.14.1
- Add test image preloading to wasm CI workflow
- Temporarily disable testing `test_complex_shaping`, which triggers
  some code path that fails somehow
This test requires a subprocess call, so should be skipped like the
others.
@QuLogic QuLogic force-pushed the text-overhaul-mergeup branch from afddabd to 17b1f31 Compare April 2, 2026 19:53
@QuLogic
Copy link
Copy Markdown
Member Author

QuLogic commented Apr 2, 2026

Oops, the preloading code will always prefer the test images from the PR, so it picks up the ones from main instead and fails. You'll have to just trust the results from the commit diff or download and run locally.

Note, all test failures are due to this (plus a few flaky timeouts); it will be fine once merged in.

FAILED lib/matplotlib/tests/test_arrow_patches.py::test_boxarrow[png] - matplotlib.testing.exceptions.ImageComparisonFailure: images not close (RMS 38.368):
	result_images/test_arrow_patches/boxarrow_test_image.png
	result_images/test_arrow_patches/boxarrow_test_image-expected.png
	result_images/test_arrow_patches/boxarrow_test_image-failed-diff.png
FAILED lib/matplotlib/tests/test_arrow_patches.py::test_boxarrow_adjustment[png] - matplotlib.testing.exceptions.ImageComparisonFailure: images not close (RMS 30.412):
	result_images/test_arrow_patches/boxarrow_adjustment_test_image.png
	result_images/test_arrow_patches/boxarrow_adjustment_test_image-expected.png
	result_images/test_arrow_patches/boxarrow_adjustment_test_image-failed-diff.png

@QuLogic QuLogic merged commit 17b1f31 into matplotlib:text-overhaul Apr 2, 2026
27 of 43 checks passed
@github-project-automation github-project-automation Bot moved this from Ready for Review to Done in Font and text overhaul Apr 2, 2026
@QuLogic QuLogic deleted the text-overhaul-mergeup branch April 2, 2026 22:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment