Skip to content

Conversation

@vstinner
Copy link
Member

@vstinner vstinner commented Sep 18, 2020

Doc/requirements.txt becomes the reference for packages and package
versions needed to build the Python documentation.

  • Doc/Makefile now uses Doc/requirements.txt
  • .travis.yml now uses "make env" of Doc/Makefile
  • Update Sphinx to version 2.4.4

(cherry picked from commit 8394500)

https://bugs.python.org/issue35293

Doc/requirements.txt becomes the reference for packages and package versions needed to build the Python documentation. * Doc/Makefile now uses Doc/requirements.txt * .travis.yml now uses "make env" of Doc/Makefile * Update Sphinx to version 2.4.4 (cherry picked from commit 8394500)
@vstinner
Copy link
Member Author

Python master uses Sphinx 3 to build the doc, but I chose to keep Sphinx 2 to build the doc of Python 3.9.

cc @JulienPalard @corona10

@vstinner
Copy link
Member Author

The Documentation build job of Travis CI produces no warning: this change fix https://bugs.python.org/issue35293 as expected.

@vstinner vstinner merged commit 9e73cac into python:3.9 Sep 18, 2020
@miss-islington
Copy link
Contributor

Thanks @vstinner for the PR 🌮🎉.. I'm working now to backport this PR to: 3.8.
🐍🍒⛏🤖

@vstinner vstinner deleted the travis_make_venv39 branch September 18, 2020 14:53
@miss-islington
Copy link
Contributor

Sorry, @vstinner, I could not cleanly backport this to 3.8 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 9e73cac173e5e9010bd18c8334fffeee1cade3a4 3.8

@bedevere-bot
Copy link

GH-22310 is a backport of this pull request to the 3.8 branch.

vstinner added a commit that referenced this pull request Sep 18, 2020
… (GH-22310) Doc/requirements.txt becomes the reference for packages and package versions needed to build the Python documentation. * Doc/Makefile now uses Doc/requirements.txt * .travis.yml now uses "make env" of Doc/Makefile * Update Sphinx to version 2.4.4 (cherry picked from commit 8394500) (cherry picked from commit 9e73cac)
ambv pushed a commit to ambv/cpython that referenced this pull request Oct 4, 2020
…ythonGH-22309) Doc/requirements.txt becomes the reference for packages and package versions needed to build the Python documentation. * Doc/Makefile now uses Doc/requirements.txt * .travis.yml now uses "make env" of Doc/Makefile * Update Sphinx to version 2.4.4 (cherry picked from commit 8394500)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

4 participants