8000 MNT: hoist latex helpers from pgf tests to matplotlib.testing · matplotlib/matplotlib@1173770 · GitHub
[go: up one dir, main page]
Skip to content

Commit 1173770

Browse files
tacaswelltacaswell
committed
MNT: hoist latex helpers from pgf tests to matplotlib.testing
Move the marks to skip if various latex installs are missing to be visible on other modules.
1 parent b7ccfb6 commit 1173770

File tree

4 files changed

+44
-28
lines changed

4 files changed

+44
-28
lines changed

‎lib/matplotlib/backends/backend_ps.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1133,6 +1133,7 @@ def draw(self):
11331133
_no_output_draw(self.figure)
11341134
return super().draw()
11351135

1136+
11361137
def convert_psfrags(tmpfile, psfrags, font_preamble, custom_preamble,
11371138
paper_width, paper_height, orientation):
11381139
"""

‎lib/matplotlib/testing/__init__.py

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
import locale
66
import logging
7+
import subprocess
8+
from pathlib import Path
9+
from tempfile import TemporaryDirectory
710

811
import matplotlib as mpl
912
from matplotlib import _api
@@ -44,3 +47,31 @@ def setup():
4447
# are not necessarily the default values as specified in rcsetup.py.
4548
set_font_settings_for_testing()
4649
set_reproducibility_for_testing()
50+
51+
52+
def check_for_pgf(texsystem):
53+
"""
54+
Check if a given TeX system + pgf is available
55+
56+
Parameters
57+
----------
58+
texsystem : str
59+
The executable name to check
60+
"""
61+
with TemporaryDirectory() as tmpdir:
62+
tex_path = Path(tmpdir, "test.tex")
63+
tex_path.write_text(r"""
64+
\documentclass{minimal}
65+
\usepackage{pgf}
66+
\begin{document}
67+
\typeout{pgfversion=\pgfversion}
68+
\makeatletter
69+
\@@end
70+
""")
71+
try:
72+
subprocess.check_call(
73+
[texsystem, "-halt-on-error", str(tex_path)], cwd=tmpdir,
74+
stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
75+
except (OSError, subprocess.CalledProcessError):
76+
return False
77+
return True

‎lib/matplotlib/tests/test_backend_bases.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import re
22

3+
from matplotlib.testing import check_for_pgf
34
from matplotlib.backend_bases import (
45
FigureCanvasBase, LocationEvent, MouseButton, MouseEvent,
56
NavigationToolbar2, RendererBase)
@@ -13,6 +14,9 @@
1314
import numpy as np
1415
import pytest
1516

17+
needs_xelatex = pytest.mark.skipif(not check_for_pgf('xelatex'),
18+
reason='xelatex + pgf is required')
19+
1620

1721
def test_uses_per_path():
1822
id = transforms.Affine2D()
@@ -189,7 +193,9 @@ def test_toolbar_zoompan():
189193
assert ax.get_navigate_mode() == "PAN"
190194

191195

192-
@pytest.mark.parametrize("backend", ['svg', 'pgf', 'ps', 'pdf'])
196+
@pytest.mark.parametrize(
197+
"backend", ['svg', 'ps', 'pdf', pytest.param('pgf', marks=needs_xelatex)]
198+
)
193199
def test_draw(backend):
194200
from matplotlib.figure import Figure
195201
from matplotlib.backends.backend_agg import FigureCanvas

‎lib/matplotlib/tests/test_backend_pgf.py

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
import datetime
22
from io import BytesIO
33
import os
4-
from pathlib import Path
54
import shutil
65
import subprocess
7-
from tempfile import TemporaryDirectory
86

97
import numpy as np
108
import pytest
119

1210
import matplotlib as mpl
1311
import matplotlib.pyplot as plt
12+
from matplotlib.testing import check_for_pgf
1413
from matplotlib.testing.compare import compare_images, ImageComparisonFailure
1514
from matplotlib.backends.backend_pgf import PdfPages, common_texification
1615
from matplotlib.testing.decorators import (_image_directories,
@@ -19,32 +18,11 @@
1918

2019
baseline_dir, result_dir = _image_directories(lambda: 'dummy func')
2120

22-
23-
def check_for(texsystem):
24-
with TemporaryDirectory() as tmpdir:
25-
tex_path = Path(tmpdir, "test.tex")
26-
tex_path.write_text(r"""
27 9E88 -
\documentclass{minimal}
28-
\usepackage{pgf}
29-
\begin{document}
30-
\typeout{pgfversion=\pgfversion}
31-
\makeatletter
32-
\@@end
33-
""")
34-
try:
35-
subprocess.check_call(
36-
[texsystem, "-halt-on-error", str(tex_path)], cwd=tmpdir,
37-
stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
38-
except (OSError, subprocess.CalledProcessError):
39-
return False
40-
return True
41-
42-
43-
needs_xelatex = pytest.mark.skipif(not check_for('xelatex'),
21+
needs_xelatex = pytest.mark.skipif(not check_for_pgf('xelatex'),
4422
reason='xelatex + pgf is required')
45-
needs_pdflatex = pytest.mark.skipif(not check_for('pdflatex'),
23+
needs_pdflatex = pytest.mark.skipif(not check_for_pgf('pdflatex'),
4624
reason='pdflatex + pgf is required')
47-
needs_lualatex = pytest.mark.skipif(not check_for('lualatex'),
25+
needs_lualatex = pytest.mark.skipif(not check_for_pgf('lualatex'),
4826
reason='lualatex + pgf is required')
4927
needs_ghostscript = pytest.mark.skipif(
5028
"eps" not in mpl.testing.compare.converter,
@@ -341,7 +319,7 @@ def test_unknown_font(caplog):
341319
@pytest.mark.parametrize("texsystem", ("pdflatex", "xelatex", "lualatex"))
342320
@pytest.mark.backend("pgf")
343321
def test_minus_signs_with_tex(fig_test, fig_ref, texsystem):
344-
if not check_for(texsystem):
322+
if not check_for_pgf(texsystem):
345323
pytest.skip(texsystem + ' + pgf is required')
346324
mpl.rcParams["pgf.texsystem"] = texsystem
347325
fig_test.text(.5, .5, "$-1$")

0 commit comments

Comments
 (0)
0