From 8bf1bd463788080f57c84efa1655eed6d37bf62f Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Tue, 21 May 2019 23:36:41 -0700 Subject: [PATCH] docs: remove legacy import for Sphinx 1.7 --- lib/spack/docs/conf.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/spack/docs/conf.py b/lib/spack/docs/conf.py index bb460e40aa..ea1a100495 100644 --- a/lib/spack/docs/conf.py +++ b/lib/spack/docs/conf.py @@ -24,12 +24,7 @@ import subprocess from glob import glob -# Since Sphinx 1.7, sphinx.apidoc has been moved to sphinx.ext.apidoc -# sphinx.apidoc is deprecated and will be removed in Sphinx 2.0 -try: - from sphinx.ext.apidoc import main as sphinx_apidoc -except ImportError: - from sphinx.apidoc import main as sphinx_apidoc +from sphinx.ext.apidoc import main as sphinx_apidoc # -- Spack customizations -----------------------------------------------------