Revert changes to force Sphinx 1.2.3

scikit-image · Mar 14, 2015 · 15f6497 · 15f6497
1 parent 9c3a6c1
commit 15f6497
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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"