Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
c987090c
Commit
c987090c
authored
Oct 22, 2019
by
Julien Palard
Committed by
GitHub
Oct 22, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bump Sphinx to 2.2.0. (GH-16532)
parent
f548a3e4
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
6 deletions
+6
-6
.azure-pipelines/docs-steps.yml
.azure-pipelines/docs-steps.yml
+2
-2
.travis.yml
.travis.yml
+1
-1
Doc/Makefile
Doc/Makefile
+1
-1
Doc/requirements.txt
Doc/requirements.txt
+1
-1
Mac/BuildScript/build-installer.py
Mac/BuildScript/build-installer.py
+1
-1
No files found.
.azure-pipelines/docs-steps.yml
View file @
c987090c
...
...
@@ -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'
...
...
.travis.yml
View file @
c987090c
...
...
@@ -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"
...
...
Doc/Makefile
View file @
c987090c
...
...
@@ -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
:
...
...
Doc/requirements.txt
View file @
c987090c
# 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
Mac/BuildScript/build-installer.py
View file @
c987090c
...
...
@@ -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
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment