Make sure sphinx is installed before building the docs on Travis

This commit is contained in:
John Wiggins
2015-09-06 15:42:08 +02:00
parent dc394abdf3
commit 97ff3576bb
2 changed files with 11 additions and 9 deletions
+1
View File
@@ -4,3 +4,4 @@ SimpleITK; python_version != '3.4'
astropy
tifffile
imageio; python_version != '2.6'
sphinx; python_version != '2.6' and python_version != '3.2'
+10 -9
View File
@@ -7,15 +7,6 @@ section "Test.with.min.requirements"
nosetests $TEST_ARGS skimage
section_end "Test.with.min.requirements"
section "Build.docs"
if [[ ($PY != 2.6) && ($PY != 3.2) ]]; then
SPHINXBUILD="python $(which sphinx-build)"
pushd doc
$SPHINXBUILD -d $HOME/.cache/sphinx -W source build/html
popd
fi
section_end "Build.docs"
section "Flake8.test"
flake8 --exit-zero --exclude=test_*,six.py skimage doc/examples viewer_examples
section_end "Flake8.test"
@@ -58,6 +49,16 @@ pip list
section_end "Install.optional.dependencies"
section "Build.docs"
if [[ ($PY != 2.6) && ($PY != 3.2) ]]; then
SPHINXBUILD="python $(which sphinx-build)"
pushd doc
$SPHINXBUILD -d $HOME/.cache/sphinx -W source build/html
popd
fi
section_end "Build.docs"
section "Run.doc.examples"
# Matplotlib settings - do not show figures during doc examples