diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2018-06-18 19:17:21 -0500 |
|---|---|---|
| committer | becker33 <becker33@llnl.gov> | 2018-06-18 17:17:21 -0700 |
| commit | 55d0d1814c0d6c482d8d49f968747a93a8acb2a0 (patch) | |
| tree | 017322fe8b3c95b6d767e28cc4da5b6dd3a62e9b /lib | |
| parent | 3e2636e10fbf340713f1e332d23772e1ec1b743d (diff) | |
| download | spack-55d0d1814c0d6c482d8d49f968747a93a8acb2a0.tar.gz spack-55d0d1814c0d6c482d8d49f968747a93a8acb2a0.tar.bz2 spack-55d0d1814c0d6c482d8d49f968747a93a8acb2a0.tar.xz spack-55d0d1814c0d6c482d8d49f968747a93a8acb2a0.zip | |
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+
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/docs/conf.py | 8 |
1 files changed, 7 insertions, 1 deletions
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 ----------------------------------------------------- |