zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow docs to be built with Sphinx 1.7.1+ (#8500)

Browse Source 
* Allow docs to be built with Sphinx 1.7.1+

* Allow docs to be built with Sphinx 2.0+
This commit is contained in:
Adam J. Stewart 2018-06-18 19:17:21 -05:00 committed by becker33
parent 3e2636e10f
commit 55d0d1814c
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/spack/docs/conf.py
View File

@ -42,7 +42,13 @@
import shutil import shutil
import subprocess import subprocess
from glob import glob 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 ----------------------------------------------------- # -- Spack customizations -----------------------------------------------------