summaryrefslogtreecommitdiffstats
path: root/docs/source/conf.py
diff options
context:
space:
mode:
authorCalum Lind <calumlind+deluge@gmail.com>2018-07-28 08:14:25 +0100
committerCalum Lind <calumlind+deluge@gmail.com>2018-07-28 10:26:02 +0100
commit3fc97672de5ef74ec5281aab3d1d0d68b120ee38 (patch)
treef3a7d184048daaa505734fa11895d61d020966ed /docs/source/conf.py
parente8e649a030d7e08dbfc60f825d5ab0392108f25e (diff)
downloaddeluge-3fc97672de5ef74ec5281aab3d1d0d68b120ee38.tar.gz
deluge-3fc97672de5ef74ec5281aab3d1d0d68b120ee38.tar.bz2
deluge-3fc97672de5ef74ec5281aab3d1d0d68b120ee38.zip
Fix the docs run failing on Travis
Likely that the deprecation warning from cryptography is causing the setup.py sphinx build command to return an error so the tox/travis job is marked as failing. Changing to calling the sphinx-build command directly solves this. Also updated the sphinx config for built-in napoleon and faster builds using jobs option.
Diffstat (limited to 'docs/source/conf.py')
-rw-r--r--docs/source/conf.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 2326f5adc..bed14d95c 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -73,7 +73,12 @@ for mod_name in MOCK_MODULES:
# Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinxcontrib.napoleon', 'sphinx.ext.coverage']
+extensions = [
+ 'sphinx.ext.autodoc',
+ 'sphinx.ext.doctest',
+ 'sphinx.ext.napoleon',
+ 'sphinx.ext.coverage',
+]
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']