Skip to content

bpo-34177: VSTS: Avoid conflict with Homebrew#8430

Merged
methane merged 1 commit into
python:masterfrom
methane:show-site
Jul 27, 2018
Merged

bpo-34177: VSTS: Avoid conflict with Homebrew#8430
methane merged 1 commit into
python:masterfrom
methane:show-site

Conversation

@methane

@methane methane commented Jul 24, 2018 •
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Member

vstinner
vstinner requested changes Jul 24, 2018
View reviewed changes

@vstinner vstinner left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

What is this chane? If it's just for debug, please add the DO-NOT-MERGE label.

@bedevere-bot

bedevere-bot commented Jul 24, 2018

Copy link
Copy Markdown

When you're done making the requested changes, leave the comment: I have made the requested changes; please review again.

@vstinner

vstinner commented Jul 24, 2018

Copy link
Copy Markdown
Member

Change, not chane ;-)

@methane methane changed the title bpo-34177: Run -m site on make pythoninfo bpo-34177: VSTS: Avoid conflict with Homebrew's Python Jul 24, 2018
@methane methane changed the title bpo-34177: VSTS: Avoid conflict with Homebrew's Python bpo-34177: VSTS: Avoid conflict with Homebrew Jul 24, 2018
@methane methane merged commit 3e7d18a into python:master Jul 27, 2018
@miss-islington

miss-islington commented Jul 27, 2018

Copy link
Copy Markdown
Contributor

Thanks @methane for the PR 🌮🎉.. I'm working now to backport this PR to: 2.7, 3.6, 3.7.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

@methane methane deleted the show-site branch July 27, 2018 07:52
@miss-islington

miss-islington commented Jul 27, 2018

Copy link
Copy Markdown
Contributor

Sorry @methane, I had trouble checking out the 3.6 backport branch.
Please backport using cherry_picker on command line.
cherry_picker 3e7d18a54b9243b9652c9ddab87c2b9153dc365f 3.6

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 27, 2018
@methane @miss-islington
vsts: Avoid conflict with Homebrew Python (pythonGH-8430)
a13ef29 
/usr/local/lib/pythonX.Y is used by Homebrew's Python already.
(cherry picked from commit 3e7d18a)

Co-authored-by: INADA Naoki <methane@users.noreply.github.com>
@bedevere-bot

bedevere-bot commented Jul 27, 2018

Copy link
Copy Markdown

GH-8491 is a backport of this pull request to the 3.7 branch.

@miss-islington

miss-islington commented Jul 27, 2018

Copy link
Copy Markdown
Contributor

Sorry, @methane, I could not cleanly backport this to 2.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 3e7d18a54b9243b9652c9ddab87c2b9153dc365f 2.7

miss-islington added a commit that referenced this pull request Jul 27, 2018
@miss-islington @methane
vsts: Avoid conflict with Homebrew Python (GH-8430)
0964aac 
/usr/local/lib/pythonX.Y is used by Homebrew's Python already.
(cherry picked from commit 3e7d18a)

Co-authored-by: INADA Naoki <methane@users.noreply.github.com>
@bedevere-bot

bedevere-bot commented Jul 27, 2018

Copy link
Copy Markdown

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

methane added a commit to methane/cpython that referenced this pull request Jul 27, 2018
@methane
[3.6] vsts: Avoid conflict with Homebrew Python (pythonGH-8430)
efbe068 
/usr/local/lib/pythonX.Y is used by Homebrew's Python already.
(cherry picked from commit 3e7d18a)

Co-authored-by: INADA Naoki <methane@users.noreply.github.com>
methane added a commit that referenced this pull request Jul 27, 2018
@methane
bpo-34177: vsts: Avoid conflict with Homebrew Python (GH-8430)
777cdd9 
/usr/local/lib/pythonX.Y is used by Homebrew's Python already.
(cherry picked from commit 3e7d18a)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vstinner vstinner vstinner requested changes

Assignees

@methane methane

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@methane @bedevere-bot @vstinner @miss-islington @the-knights-who-say-ni