Skip to content
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

[2.7] bpo-31036: Allow sphinx and blurb to be found automatically. #16638

Merged
merged 1 commit into from Oct 8, 2019

Conversation

@benjaminp
Copy link
Contributor

benjaminp commented Oct 8, 2019

Rather than requiring the path to blurb and/or sphinx-build to be specified to the make rule, enhance the Doc/Makefile to look for each first in a virtual environment created by make venv and, if not found, look on the normal process PATH. This allows the Doc/Makefile to take advantage of an installed spinx-build or blurb and, thus, do the right thing most of the time. Also, make the directory for the venv be configurable and document the make venv target..
(cherry picked from commit 590665c)

Co-authored-by: Ned Deily nad@python.org

https://bugs.python.org/issue31036

…-3440)

Rather than requiring the path to blurb and/or sphinx-build to be specified to the make rule, enhance the Doc/Makefile to look for each first in a virtual environment created by make venv and, if not found, look on the normal process PATH. This allows the Doc/Makefile to take advantage of an installed spinx-build or blurb and, thus, do the right thing most of the time. Also, make the directory for the venv be configurable and document the `make venv` target..
(cherry picked from commit 590665c)

Co-authored-by: Ned Deily <nad@python.org>
@benjaminp benjaminp added the skip news label Oct 8, 2019
@benjaminp benjaminp merged commit 0bd59d6 into 2.7 Oct 8, 2019
4 checks passed
4 checks passed
bedevere/issue-number Issue number 31036 found
Details
bedevere/maintenance-branch-pr Valid maintenance branch PR title.
bedevere/news "skip news" label found
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@benjaminp benjaminp deleted the backport-590665c-2.7 branch Oct 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.