Skip to content

[3.9] bpo-35293: Travis CI uses "make venv" for the doc (GH-22307) #22309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 18, 2020
Merged

[3.9] bpo-35293: Travis CI uses "make venv" for the doc (GH-22307) #22309

merged 1 commit into from
Sep 18, 2020

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants