From 55d0d1814c0d6c482d8d49f968747a93a8acb2a0 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 18 Jun 2018 19:17:21 -0500 Subject: Allow docs to be built with Sphinx 1.7.1+ (#8500) * Allow docs to be built with Sphinx 1.7.1+ * Allow docs to be built with Sphinx 2.0+ --- lib/spack/docs/conf.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/spack/docs/conf.py b/lib/spack/docs/conf.py index e051b6e405..97b46970bd 100644 --- a/lib/spack/docs/conf.py +++ b/lib/spack/docs/conf.py @@ -42,7 +42,13 @@ import re import shutil import subprocess from glob import glob -from sphinx.apidoc import main as sphinx_apidoc + +# 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 # -- Spack customizations ----------------------------------------------------- -- cgit v1.2.3-60-g2f50