[3.6] bpo-31036: Allow sphinx and blurb to be found automatically (GH-3440)#3441
Merged
ned-deily merged 1 commit intoSep 8, 2017
python:3.6python/cpython:3.6from
miss-islington:backport-590665c-3.6miss-islington/cpython:backport-590665c-3.6Copy head branch name to clipboard
Merged
[3.6] bpo-31036: Allow sphinx and blurb to be found automatically (GH-3440)#3441ned-deily merged 1 commit intopython:3.6python/cpython:3.6from miss-islington:backport-590665c-3.6miss-islington/cpython:backport-590665c-3.6Copy head branch name to clipboard
ned-deily merged 1 commit into
python:3.6python/cpython:3.6from
miss-islington:backport-590665c-3.6miss-islington/cpython:backport-590665c-3.6Copy head branch name to clipboard
Conversation
…thonGH-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)
|
Hello, and thanks for your contribution! I'm a bot set up to make sure that the project can legally accept your contribution by verifying you have signed the PSF contributor agreement (CLA). Unfortunately we couldn't find an account corresponding to your GitHub username on bugs.python.org (b.p.o) to verify you have signed the CLA (this might be simply due to a missing "GitHub Name" entry in your b.p.o account settings). This is necessary for legal reasons before we can look at your contribution. Please follow the steps outlined in the CPython devguide to rectify this issue. Thanks again to your contribution and we look forward to looking at it! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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 venvtarget.(cherry picked from commit 590665c)
https://bugs.python.org/issue31036