From 42ca0e9aa29052511f2f2f5bec2d8f728c373dc2 Mon Sep 17 00:00:00 2001
From: Mariatta <Mariatta@users.noreply.github.com>
Date: Tue, 16 May 2017 13:48:25 -0700
Subject: [PATCH] Fix merge conflicts

---
 .travis.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 27b63c6c08b376..58a8eb4e2d2fb8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,9 +37,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"
+        - make check suspicious html SPHINXOPTS="-q -W"
     - os: linux
       language: c
       compiler: clang