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 effefaf

Browse filesBrowse files
QuLogicQuLogic
committed
TST: Re-generate SVG files that use fonttype='none'
We currently special-case the SVG converter depending on if it used fonttype='none', and use one that has our base fonts available. However, this is not based on the rcParam setting (because we don't have that at conversion time), but on whether the SVG text contains the font styling [1]. This check for styling uses the _current_ version, which was changed way back in #19253. These files were never re-generated though, and used the old version of the style, meaning the expected images never triggered the special converter. The result images are written with the current style, and _do_ trigger the special conveter. Evidentally, this never was a problem for most developers, because everyone had DejaVu Sans installed globally, so the expected images matched. However, on the clean macOS CI, it's not installed globally, so the expected images get converted with the wrong font, and the test fails. [1] https://github.com/matplotlib/matplotlib/blob/de1102668dbc0694e98653bd17641e9d99394e57/lib/matplotlib/testing/compare.py#L303
1 parent e793b22 commit effefaf
Copy full SHA for effefaf

File tree

Expand file treeCollapse file tree

4 files changed

+127
-95
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+127
-95
lines changed

‎lib/matplotlib/backends/backend_svg.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_svg.py
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1085,6 +1085,11 @@ def _draw_text_as_path(self, gc, x, y, s, prop, angle, ismath, mtext=None):
10851085
writer.end('g')
10861086

10871087
def _draw_text_as_text(self, gc, x, y, s, prop, angle, ismath, mtext=None):
1088+
# NOTE: If you change the font styling CSS, then be sure the check for
1089+
# svg.fonttype = none in `lib/matplotlib/testing/compare.py::convert` remains in
1090+
# sync. Also be sure to re-generate any SVG using this mode, or else such tests
1091+
# will fail to use the right converter for the expected images, and they will
1092+
# fail strangely.
10881093
writer = self.writer
10891094

10901095
color = rgb2hex(gc.get_rgb())

‎lib/matplotlib/testing/compare.py

Copy file name to clipboardExpand all lines: lib/matplotlib/testing/compare.py
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,11 @@ def convert(filename, cache):
300300
convert = converter[path.suffix[1:]]
301301
if path.suffix == ".svg":
302302
contents = path.read_text()
303+
# NOTE: This check should be kept in sync with font styling in
304+
# `lib/matplotlib/backends/backend_svg.py`. If it changes, then be sure to
305+
# re-generate any SVG test files using this mode, or else such tests will
306+
# fail to use the converter for the expected images (but will for the
307+
# results), and the tests will fail strangely.
303308
if 'style="font:' in contents:
304309
# for svg.fonttype = none, we explicitly patch the font search
305310
# path so that fonts shipped by Matplotlib are found.

0 commit comments

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