From 15f6497bfecd26027f33e73cee07ff88e90869d0 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Sat, 14 Mar 2015 10:35:59 -0500
Subject: [PATCH] Revert changes to force Sphinx 1.2.3

---
 Makefile               | 2 +-
 tools/travis_script.sh | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 2de60516..b80eba0d 100644
--- a/Makefile
+++ b/Makefile
@@ -16,5 +16,5 @@ coverage:
 	nosetests skimage --with-coverage --cover-package=skimage
 
 html:
-	pip install -q sphinx==1.2.3
+	pip install -q sphinx
 	export SPHINXOPTS=-W; make -C doc html
diff --git a/tools/travis_script.sh b/tools/travis_script.sh
index 3ffb58f1..8dc2bb4e 100755
--- a/tools/travis_script.sh
+++ b/tools/travis_script.sh
@@ -10,7 +10,6 @@ section_end "Test.with.min.requirements"
 section "Build.docs"
 if [[ ($PY != 2.6) && ($PY != 3.2) ]]; then
     sudo apt-get install -qq texlive texlive-latex-extra dvipng
-    pip install -U setuptools pip
     make html
 fi
 section_end "Build.docs"