summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Deily <nad@python.org>2021-10-28 19:08:42 (GMT)
committerGitHub <noreply@github.com>2021-10-28 19:08:42 (GMT)
commitf2407144347fafcd69c2ade41b5d9c3fb07b59ef (patch)
tree8f1da2528102f1213ab7d756cc6f5a91a43798fa
parent2ce38167000fef3a71f1783acdda2a2cf7a2df39 (diff)
downloadcpython-f2407144347fafcd69c2ade41b5d9c3fb07b59ef.zip
cpython-f2407144347fafcd69c2ade41b5d9c3fb07b59ef.tar.gz
cpython-f2407144347fafcd69c2ade41b5d9c3fb07b59ef.tar.bz2
[3.9] bpo-45618: Fix documentation build by pinning Docutils version to 0.17.1 (GH-29230) (GH-29241) (GH-29245)
Co-authored-by: Maciej Olko <maciej.olko@yougov.com> Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
-rw-r--r--.azure-pipelines/docs-steps.yml7
-rw-r--r--Doc/requirements.txt4
2 files changed, 8 insertions, 3 deletions
diff --git a/.azure-pipelines/docs-steps.yml b/.azure-pipelines/docs-steps.yml
index 492e4e3..ae75339 100644
--- a/.azure-pipelines/docs-steps.yml
+++ b/.azure-pipelines/docs-steps.yml
@@ -12,11 +12,12 @@ steps:
inputs:
versionSpec: '>=3.6'
-- script: python -m pip install sphinx==1.8.2 blurb python-docs-theme
+- script: python -m pip install -r requirements.txt
+ workingDirectory: '$(build.sourcesDirectory)/Doc'
displayName: 'Install build dependencies'
- ${{ if ne(parameters.latex, 'true') }}:
- - script: make check suspicious html PYTHON=python
+ - script: make check html PYTHON=python
workingDirectory: '$(build.sourcesDirectory)/Doc'
displayName: 'Build documentation'
@@ -31,7 +32,7 @@ steps:
- ${{ if eq(parameters.upload, 'true') }}:
- task: PublishBuildArtifacts@1
displayName: 'Publish docs'
-
+
inputs:
PathToPublish: '$(build.sourcesDirectory)/Doc/build'
ArtifactName: docs
diff --git a/Doc/requirements.txt b/Doc/requirements.txt
index 47b78ee..cb21ed2 100644
--- a/Doc/requirements.txt
+++ b/Doc/requirements.txt
@@ -4,6 +4,10 @@
# won't suddenly cause build failures. Updating the version is fine as long
# as no warnings are raised by doing so.
sphinx==2.4.4
+# Docutils version is pinned to a version compatible with Sphinx
+# version 2.4.4. It can be removed after bumping Sphinx version to at
+# least 3.5.4.
+docutils==0.17.1
blurb