From 8c2d8e8e0049b0206dc492fb078d21edb5106eb2 Mon Sep 17 00:00:00 2001
From: John Wiggins <jwiggins@enthought.com>
Date: Sun, 13 Sep 2015 13:11:48 +0200
Subject: [PATCH] Remove sphinx from the optional dependencies

---
 optional_requirements.txt |  1 -
 tools/travis_script.sh    | 13 ++++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/optional_requirements.txt b/optional_requirements.txt
index d6472ca0..6dff92af 100644
--- a/optional_requirements.txt
+++ b/optional_requirements.txt
@@ -4,4 +4,3 @@ 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 f46d5306..ad3afca3 100755
--- a/tools/travis_script.sh
+++ b/tools/travis_script.sh
@@ -7,6 +7,12 @@ 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
+    export SPHINXCACHE=$HOME/.cache/sphinx; make html
+fi
+section_end "Build.docs"
+
 section "Flake8.test"
 flake8 --exit-zero --exclude=test_*,six.py skimage doc/examples viewer_examples
 section_end "Flake8.test"
@@ -49,13 +55,6 @@ pip list
 section_end "Install.optional.dependencies"
 
 
-section "Build.docs"
-if [[ ($PY != 2.6) && ($PY != 3.2) ]]; then
-    export SPHINXCACHE=$HOME/.cache/sphinx; make html
-fi
-section_end "Build.docs"
-
-
 section "Run.doc.examples"
 
 # Matplotlib settings - do not show figures during doc examples