diff --git a/optional_requirements.txt b/optional_requirements.txt index 6dff92af..d6472ca0 100644 --- a/optional_requirements.txt +++ b/optional_requirements.txt @@ -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' diff --git a/tools/travis_script.sh b/tools/travis_script.sh index 0331575b..945f6a49 100755 --- a/tools/travis_script.sh +++ b/tools/travis_script.sh @@ -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