[Python-checkins] Doc: Bump Sphinx verison. (#13785)

Julien Palard webhook-mailer at python.org
Sat Jun 15 09:42:02 EDT 2019


https://github.com/python/cpython/commit/7d23dbe6d17bb872da5b89a5674cb32a7a1a2b9c
commit: 7d23dbe6d17bb872da5b89a5674cb32a7a1a2b9c
branch: master
author: Julien Palard <julien at palard.fr>
committer: GitHub <noreply at github.com>
date: 2019-06-15T15:41:58+02:00
summary:

Doc: Bump Sphinx verison. (#13785)

To reflect the one we're using in production.

files:
M .azure-pipelines/docs-steps.yml
M .travis.yml
M Doc/Makefile

diff --git a/.azure-pipelines/docs-steps.yml b/.azure-pipelines/docs-steps.yml
index 492e4e34bb2d..96361961ea75 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.8.2 blurb python-docs-theme
+- script: python -m pip install sphinx==2.0.1 blurb python-docs-theme
   displayName: 'Install build dependencies'
 
 - ${{ if ne(parameters.latex, 'true') }}:
diff --git a/.travis.yml b/.travis.yml
index 02de997750ab..addff7733479 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,7 +55,7 @@ matrix:
         # 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.)
         # The theme used by the docs is stored separately, so we need to install that as well.
-        - python -m pip install sphinx==1.8.2 blurb python-docs-theme
+        - python -m pip install sphinx==2.0.1 blurb python-docs-theme
       script:
         - make check suspicious html SPHINXOPTS="-q -W -j4"
     - name: "Documentation tests"
diff --git a/Doc/Makefile b/Doc/Makefile
index 6f86728ea834..3bcd9f23752b 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -133,7 +133,7 @@ clean:
 venv:
 	$(PYTHON) -m venv $(VENVDIR)
 	$(VENVDIR)/bin/python3 -m pip install -U pip setuptools
-	$(VENVDIR)/bin/python3 -m pip install -U Sphinx blurb python-docs-theme
+	$(VENVDIR)/bin/python3 -m pip install -U Sphinx==2.0.1 blurb python-docs-theme
 	@echo "The venv has been created in the $(VENVDIR) directory"
 
 dist:



More information about the Python-checkins mailing list