From 7d65366b6737a8812ea1c156b8793de5024ede9f Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Fri, 13 Mar 2015 22:07:04 -0500
Subject: [PATCH] Try a fix for py27 build

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

diff --git a/Makefile b/Makefile
index b80eba0d..2de60516 100644
--- a/Makefile
+++ b/Makefile
@@ -16,5 +16,5 @@ coverage:
 	nosetests skimage --with-coverage --cover-package=skimage
 
 html:
-	pip install -q sphinx
+	pip install -q sphinx==1.2.3
 	export SPHINXOPTS=-W; make -C doc html
diff --git a/tools/travis_script.sh b/tools/travis_script.sh
index 8dc2bb4e..3ffb58f1 100755
--- a/tools/travis_script.sh
+++ b/tools/travis_script.sh
@@ -10,6 +10,7 @@ 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"