Skip to content

Commit be5f8cc

Browse files
authoredJul 22, 2018
Merge pull request matplotlib#11736 from anntzer/unusedmarker
TST: Remove unused needs_sphinx marker; move importorskip to toplevel.
2 parents 23420a4 + f84e88d commit be5f8cc

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed
 

‎lib/matplotlib/sphinxext/tests/test_tinypages.py

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
""" Tests for tinypages build using sphinx extensions """
1+
"""Tests for tinypages build using sphinx extensions."""
22

33
import filecmp
44
from os.path import join as pjoin, dirname, isdir
@@ -10,13 +10,10 @@
1010
from matplotlib import cbook
1111

1212

13-
needs_sphinx = pytest.mark.skipif(
14-
call([sys.executable, '-msphinx', '--help'], stdout=PIPE, stderr=PIPE),
15-
reason="'{} -msphinx' does not return 0".format(sys.executable))
13+
pytest.importorskip('sphinx')
1614

1715

1816
def test_tinypages(tmpdir):
19-
pytest.importorskip('sphinx')
2017
html_dir = pjoin(str(tmpdir), 'html')
2118
doctree_dir = pjoin(str(tmpdir), 'doctrees')
2219
# Build the pages with warnings turned into errors

0 commit comments

Comments
 (0)
Please sign in to comment.