Merge pull request #11736 from anntzer/unusedmarker

tacaswell · web-flow · commit be5f8ccd59f6 · 2018-07-22T12:26:37.000-04:00
TST: Remove unused needs_sphinx marker; move importorskip to toplevel.
diff --git a/lib/matplotlib/sphinxext/tests/test_tinypages.py b/lib/matplotlib/sphinxext/tests/test_tinypages.py
@@ -1,4 +1,4 @@
-""" Tests for tinypages build using sphinx extensions """
+"""Tests for tinypages build using sphinx extensions."""
 
 import filecmp
 from os.path import join as pjoin, dirname, isdir
@@ -10,13 +10,10 @@
 from matplotlib import cbook
 
 
-needs_sphinx = pytest.mark.skipif(
-    call([sys.executable, '-msphinx', '--help'], stdout=PIPE, stderr=PIPE),
-    reason="'{} -msphinx' does not return 0".format(sys.executable))
+pytest.importorskip('sphinx')
 
 
 def test_tinypages(tmpdir):
-    pytest.importorskip('sphinx')
     html_dir = pjoin(str(tmpdir), 'html')
     doctree_dir = pjoin(str(tmpdir), 'doctrees')
     # Build the pages with warnings turned into errors
