◐ Shell
reader mode source ↗
Skip to content

bpo-31036: Allow sphinx and blurb to be found automatically#3440

Merged
ned-deily merged 9 commits into
python:masterfrom
ned-deily:pr_2953
Sep 8, 2017
Merged

bpo-31036: Allow sphinx and blurb to be found automatically#3440
ned-deily merged 9 commits into
python:masterfrom
ned-deily:pr_2953

Conversation

@ned-deily

@ned-deily ned-deily commented Sep 7, 2017 •
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Member

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.

https://bugs.python.org/issue31036

@larryhastings

larryhastings commented Sep 7, 2017

Copy link
Copy Markdown
Contributor

Brett's done all the reviewing so far, but he's on vacation from Python this month. I don't mind reviewing it but I'm likely to just rubber-stamp it. I can do that if that's what you want ;-)

benjaminp
benjaminp approved these changes Sep 8, 2017
View reviewed changes

@benjaminp benjaminp left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hide comment

innocuous enough

@ned-deily ned-deily merged commit 590665c into python:master Sep 8, 2017
@miss-islington

miss-islington commented Sep 8, 2017

Copy link
Copy Markdown
Contributor

🐍🍒⛏🤖 Thanks @ned-deily for the PR, and @ned-deily for merging it 🌮🎉.I'm working now to backport this PR to: 3.6.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Sep 8, 2017
@ned-deily @miss-islington
[3.6] bpo-31036: Allow sphinx and blurb to be found automatically (py… …
fb980df 
…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)
@bedevere-bot

bedevere-bot commented Sep 8, 2017

Copy link
Copy Markdown

GH-3441 is a backport of this pull request to the 3.6 branch.

@ned-deily ned-deily deleted the pr_2953 branch September 8, 2017 00:18
ned-deily pushed a commit that referenced this pull request Sep 8, 2017
@miss-islington @ned-deily
[3.6] bpo-31036: Allow sphinx and blurb to be found automatically (GH… …
645c1e4 
…-3440) (#3441)

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)
@ned-deily ned-deily mentioned this pull request Sep 8, 2017
Closed
ned-deily added a commit that referenced this pull request Sep 8, 2017
@ned-deily
[3.5] bpo-31036: Allow sphinx and blurb to be found automatically (GH… …
9cc3320 
…-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.
@miss-islington

miss-islington commented Oct 8, 2019

Copy link
Copy Markdown
Contributor

Thanks @ned-deily for the PR 🌮🎉.. I'm working now to backport this PR to: 2.7.
🐍🍒⛏🤖

@miss-islington

miss-islington commented Oct 8, 2019

Copy link
Copy Markdown
Contributor

Sorry, @ned-deily, I could not cleanly backport this to 2.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 590665c399fc4aa3c4a9f8e7104d43a02e9f3a0c 2.7

benjaminp pushed a commit that referenced this pull request Oct 8, 2019
@ned-deily @benjaminp
[2.7] bpo-31036: Allow sphinx and blurb to be found automatically (GH… …
ea92792 
…-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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@benjaminp benjaminp benjaminp approved these changes

@larryhastings larryhastings Awaiting requested review from larryhastings

@brettcannon brettcannon Awaiting requested review from brettcannon

Assignees

@ned-deily ned-deily

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@ned-deily @larryhastings @miss-islington @bedevere-bot @benjaminp @Mariatta @the-knights-who-say-ni @brettcannon