From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sun, 9 Dec 2018 05:34:30 +0000 (-0800)
Subject: [3.7] Doc: Bump sphinx. (GH-10676) (GH-10803)
X-Git-Tag: v3.6.8rc1~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=23a98abd4256f931ed89b65ec6babd4f06dbff97;p=thirdparty%2FPython%2Fcpython.git

[3.7] Doc: Bump sphinx. (GH-10676) (GH-10803)

(cherry picked from commit 2db96ae7444880d66d4ef65abab8a5e6ff328711)

Co-authored-by: Julien Palard <julien@palard.fr>
---

diff --git a/.azure-pipelines/docs-steps.yml b/.azure-pipelines/docs-steps.yml
index c0404aebdcc5..492e4e34bb2d 100644
--- a/.azure-pipelines/docs-steps.yml
+++ b/.azure-pipelines/docs-steps.yml
@@ -12,7 +12,7 @@ steps:
   inputs:
     versionSpec: '>=3.6'
 
-- script: python -m pip install sphinx~=1.6.1 blurb python-docs-theme
+- script: python -m pip install sphinx==1.8.2 blurb python-docs-theme
   displayName: 'Install build dependencies'
 
 - ${{ if ne(parameters.latex, 'true') }}:
diff --git a/.travis.yml b/.travis.yml
index ed4e46c782f7..8250fd91b3d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,7 +43,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 blurb
+        - python -m pip install sphinx==1.8.2 blurb
       script:
         - make check suspicious html SPHINXOPTS="-q -W -j4"
     - os: linux