From 9886384eaa1ca8f6ea25f7e5f0b3dfea2b080d42 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 1/3] bpo-30380: Pin the version of Sphinx used to build the
 documentation (GH-1612)

---
 .travis.yml | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 16fd0251091fd3..65ebf3ebea6add 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,29 @@ matrix:
         - TESTING=docs
       before_script:
         - cd Doc
-        - pip install -U Sphinx
+        # 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 SPHINXOPTS="-q -W"
+    - os: linux
+      language: c
+      compiler: gcc
+      env:
+        - TESTING=coverage
+      before_script:
+        - |
+            if ! git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(\.(rst|yml)$)|(^Doc)|(^Misc)/'
+            then
+              echo "Only docs were updated, stopping build process."
+              exit
+            fi
+            ./configure
+            make -s -j4
+            # Need a venv that can parse covered code.
+            ./python -m venv venv
+            ./venv/bin/python -m pip install -U coverage
+>>>>>>> fca224f117... bpo-30380: Pin the version of Sphinx used to build the documentation (GH-1612)
       script:
         - make check suspicious html SPHINXOPTS="-q -W"
 

From c407c46c3fae14966ad6968307eb5521113e0136 Mon Sep 17 00:00:00 2001
From: Brett Cannon <brett@python.org>
Date: Tue, 16 May 2017 14:15:07 -0700
Subject: [PATCH 2/3] Drop coverage bits

---
 .travis.yml | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 65ebf3ebea6add..568b6f06d902f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,26 +33,6 @@ matrix:
         - python -m pip install sphinx~=1.6.1
       script:
         - make check suspicious html SPHINXOPTS="-q -W"
-    - os: linux
-      language: c
-      compiler: gcc
-      env:
-        - TESTING=coverage
-      before_script:
-        - |
-            if ! git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(\.(rst|yml)$)|(^Doc)|(^Misc)/'
-            then
-              echo "Only docs were updated, stopping build process."
-              exit
-            fi
-            ./configure
-            make -s -j4
-            # Need a venv that can parse covered code.
-            ./python -m venv venv
-            ./venv/bin/python -m pip install -U coverage
->>>>>>> fca224f117... bpo-30380: Pin the version of Sphinx used to build the documentation (GH-1612)
-      script:
-        - make check suspicious html SPHINXOPTS="-q -W"
 
 # Travis provides only 2 cores, so don't overdue the parallelism and waste memory.
 before_script:

From f913164809e4161fbcd7eaea2932fb6a27d7e97d Mon Sep 17 00:00:00 2001
From: Brett Cannon <brettcannon@users.noreply.github.com>
Date: Tue, 16 May 2017 14:31:31 -0700
Subject: [PATCH 3/3] Pin Sphinx to 1.5.6

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 568b6f06d902f1..0bc552a621cfe1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,7 @@ matrix:
         - cd Doc
         # 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
+        - python -m pip install sphinx~=1.5.6
       script:
         - make check suspicious html SPHINXOPTS="-q -W"