diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2019-05-21 23:36:41 -0700 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2019-05-26 18:23:44 -0700 |
| commit | 8bf1bd463788080f57c84efa1655eed6d37bf62f (patch) | |
| tree | a37d566c150c3bf9b9acbd02551f45d44f75e427 /lib/spack/docs/conf.py | |
| parent | e1c5d1378bcbd0235651786bfd548d388f332013 (diff) | |
| download | spack-8bf1bd463788080f57c84efa1655eed6d37bf62f.tar.gz spack-8bf1bd463788080f57c84efa1655eed6d37bf62f.tar.bz2 spack-8bf1bd463788080f57c84efa1655eed6d37bf62f.tar.xz spack-8bf1bd463788080f57c84efa1655eed6d37bf62f.zip | |
docs: remove legacy import for Sphinx 1.7
Diffstat (limited to 'lib/spack/docs/conf.py')
| -rw-r--r-- | lib/spack/docs/conf.py | 7 |
1 files changed, 1 insertions, 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 shutil 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 ----------------------------------------------------- |