[Python-checkins] Bump Sphinx to 2.2.0. (GH-16532)
Julien Palard
webhook-mailer at python.org
Tue Oct 22 12:14:07 EDT 2019
https://github.com/python/cpython/commit/c987090c731a363c58a02d0efcb3c2d49ccf61ed
commit: c987090c731a363c58a02d0efcb3c2d49ccf61ed
branch: master
author: Julien Palard <julien at palard.fr>
committer: GitHub <noreply at github.com>
date: 2019-10-22T18:13:41+02:00
summary:
Bump Sphinx to 2.2.0. (GH-16532)
files:
M .azure-pipelines/docs-steps.yml
M .travis.yml
M Doc/Makefile
M Doc/requirements.txt
M Mac/BuildScript/build-installer.py
diff --git a/.azure-pipelines/docs-steps.yml b/.azure-pipelines/docs-steps.yml
index 96361961ea75e..eaf4ad01927ae 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==2.0.1 blurb python-docs-theme
+- script: python -m pip install sphinx==2.2.0 blurb python-docs-theme
displayName: 'Install build dependencies'
- ${{ if ne(parameters.latex, 'true') }}:
@@ -21,7 +21,7 @@ steps:
displayName: 'Build documentation'
- ${{ if eq(parameters.latex, 'true') }}:
- - script: sudo apt-get update && sudo apt-get install -qy --force-yes texlive-full
+ - script: sudo apt-get update && sudo apt-get install -qy --force-yes texlive-full
displayName: 'Install LaTeX'
- script: make dist PYTHON=python SPHINXBUILD='python -m sphinx' BLURB='python -m blurb'
diff --git a/.travis.yml b/.travis.yml
index d4275fde64243..807a7b2f24a12 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==2.0.1 blurb python-docs-theme
+ - python -m pip install sphinx==2.2.0 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 86207fe57a0f6..05361f2ee2c82 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -143,7 +143,7 @@ clean:
venv:
$(PYTHON) -m venv $(VENVDIR)
$(VENVDIR)/bin/python3 -m pip install -U pip setuptools
- $(VENVDIR)/bin/python3 -m pip install -U Sphinx==2.0.1 blurb python-docs-theme
+ $(VENVDIR)/bin/python3 -m pip install -U Sphinx==2.2.0 blurb python-docs-theme
@echo "The venv has been created in the $(VENVDIR) directory"
dist:
diff --git a/Doc/requirements.txt b/Doc/requirements.txt
index e0d7ca869af8c..198446b350ff2 100644
--- a/Doc/requirements.txt
+++ b/Doc/requirements.txt
@@ -1,5 +1,5 @@
# Requirements for docs build on netlify
# Pin sphinx to version specified in .travis.yml
-sphinx==2.0.1
+sphinx==2.2.0
blurb
python-docs-theme
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 0dd53647dd33e..3d1381b895b2f 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -1068,7 +1068,7 @@ def buildPythonDocs():
runCommand('make clean')
# Create virtual environment for docs builds with blurb and sphinx
runCommand('make venv')
- runCommand('venv/bin/python3 -m pip install -U Sphinx==2.0.1')
+ runCommand('venv/bin/python3 -m pip install -U Sphinx==2.2.0')
runCommand('make html PYTHON=venv/bin/python')
os.chdir(curDir)
if not os.path.exists(docdir):
More information about the Python-checkins
mailing list