Permalink
Browse files

Merge pull request #2662 from grlee77/sphinx_pin

pin sphinx to <1.6
  • Loading branch information...
2 parents a114d99 + d6af483 commit d387a7d6bab439dc0dc31ad52296d53eeff31573 @sciunto sciunto committed on GitHub May 18, 2017
Showing with 3 additions and 3 deletions.
  1. +1 −1 Makefile
  2. +2 −2 appveyor.yml
View
@@ -19,5 +19,5 @@ coverage:
$(PYTESTS) skimage --cov=skimage
html:
- pip install -q sphinx
+ pip install -q 'sphinx<1.6'
export SPHINXOPTS=-W; make -C doc html
View
@@ -29,7 +29,7 @@ environment:
install:
- ECHO "Filesystem root:"
- ps: "ls \"C:/\""
-
+
# Install Python and all the required packages.
- "powershell ./tools/appveyor/install.ps1"
@@ -59,7 +59,7 @@ build: false
test_script:
# Build the docs
- - pip install sphinx
+ - pip install "sphinx<1.6"
- SET PYTHON=%PYTHON%\\python.exe && cd doc && make html
# Change to a non-source folder to make sure we run the tests on the

0 comments on commit d387a7d

Please sign in to comment.