From: Mariatta <Mariatta@users.noreply.github.com>
Date: Tue, 16 May 2017 20:48:25 +0000 (-0700)
Subject: bpo-30380: Pin the version of Sphinx used to build the documentation (GH-1612)
X-Git-Tag: v3.7.0a1~802
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fca224f117d25bdfec1bf7160b67438c4fcf6dee;p=thirdparty%2FPython%2Fcpython.git

bpo-30380: Pin the version of Sphinx used to build the documentation (GH-1612)
---

diff --git a/.travis.yml b/.travis.yml
index 2062e81bea9e..c4a214997498 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,9 +38,11 @@ matrix:
         - TESTING=docs
       before_script:
         - cd Doc
-        - make venv
+        # Sphinx is pinned so that new versions that introduce new warnings won't suddenly cause build failures.
+        # (Updating the version is fine as long as no warnings are raised by doing so.)
+        - python -m pip install sphinx~=1.6.1
       script:
-        - make check suspicious html PYTHON="./venv/bin/python" SPHINXBUILD="./venv/bin/python -m sphinx" SPHINXOPTS="-q -W"
+        - make check suspicious html SPHINXOPTS="-q -W"
     - os: linux
       language: c
       compiler: gcc