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.

1 files changed, 2 insertions, 6 deletions

diff --git a/tox.ini b/tox.ini
index 126f5796b..aa3aa7ce9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -176,7 +176,6 @@ changedir = docs
 deps =
     {[testenv]deps}
     sphinx
-    sphinxcontrib-napoleon
 whitelist_externals =
     {[testenv]whitelist_externals}
 
@@ -185,11 +184,8 @@ sitepackages = {[docsbase]sitepackages}
 deps = {[docsbase]deps}
 commands =
     python setup.py clean_docs
-    python -c "print '> sphinx-apidoc --force -o docs/source/modules/ deluge deluge/plugins\n'\
-        '> sphinx-build -v -E -T -b html -d docs/build/doctrees docs/source docs/build/html';\
-        import subprocess, sys; proc = subprocess.Popen(\
-        'python setup.py build_docs', shell=True, stderr=subprocess.PIPE);\
-        err = proc.communicate()[1]; print err; sys.exit(bool(err))"
+    sphinx-apidoc --force -o docs/source/modules/ deluge deluge/plugins
+    sphinx-build -v -j auto -E -T -b html -d docs/build/doctrees docs/source docs/build/html
 
 [testenv:docscoverage]
 sitepackages = {[docsbase]sitepackages}