Skip to content

bpo-30273: update distutils.sysconfig#1515

Merged
vstinner merged 1 commit into
python:masterfrom
jkloth:issue30273
May 9, 2017
Merged

bpo-30273: update distutils.sysconfig#1515
vstinner merged 1 commit into
python:masterfrom
jkloth:issue30273

Conversation

@jkloth
Copy link
Copy Markdown
Contributor

@jkloth jkloth commented May 9, 2017

Fixes include directory returned when Python is compiled out-of-tree (builddir != srcdir) and run from a venv. (see also bpo-15366)

@jkloth
bpo-30273: update distutils.sysconfig for venv's created from Python
0c4e77a 
compiled out-of-tree (builddir != srcdir). (see also bpo-15366)
@the-knights-who-say-ni
Copy link
Copy Markdown

the-knights-who-say-ni commented May 9, 2017

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 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!

@jkloth
Copy link
Copy Markdown
Contributor Author

jkloth commented May 9, 2017 via email

vstinner
vstinner reviewed May 9, 2017
View reviewed changes
Comment thread Lib/distutils/sysconfig.py
return base
if _sys_home:
incdir = os.path.join(_sys_home, 'Include')
return _sys_home or project_base
Copy link
Copy Markdown
Member

@vstinner vstinner May 9, 2017

Choose a reason for hiding this comment

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

Calling normpath() on these paths shouldn't hurt.

Copy link
Copy Markdown
Contributor Author

@jkloth jkloth May 9, 2017

Choose a reason for hiding this comment

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

Sure, but just doing what was already there (and note that they are used "bare" everywhere else in the file).

Copy link
Copy Markdown
Member

@vstinner vstinner May 9, 2017

Choose a reason for hiding this comment

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

Sorry, I was confused by the "unified diff" view. With the "Split" view, it's better :-) Ok, your change doesn't remove any normpath() call.

@vstinner
Copy link
Copy Markdown
Member

vstinner commented May 9, 2017

Updated GitHub username on b.p.o user details (already signed the CLA)

I removed the CLA status: the CLA status was then updated properly ;-)

@vstinner vstinner requested a review from brettcannon May 9, 2017 13:07
@vstinner
Copy link
Copy Markdown
Member

vstinner commented May 9, 2017

On the coverage job, 2 tests failed (test_traceback test_xml_etree) but it doesn't seem to be related to this change?

@vstinner vstinner merged commit dbdea62 into python:master May 9, 2017
@vstinner
Copy link
Copy Markdown
Member

vstinner commented May 9, 2017

Ok, I succeeded to reproduce the bug and validate that your change fixed it. Thanks!

Would you mind to backport the change to 3.6, 3.5 and 2.7 branches please? https://docs.python.org/devguide/committing.html#backporting-changes-to-an-older-version

vstinner added a commit that referenced this pull request May 17, 2017
@vstinner
bpo-30273: update distutils.sysconfig for venv's created from Python (#…
460945f 
…1515) (#1625)

compiled out-of-tree (builddir != srcdir). (see also bpo-15366)
(cherry picked from commit dbdea62)
vstinner added a commit that referenced this pull request May 17, 2017
@vstinner
bpo-30273: update distutils.sysconfig for venv's created from Python (#…
f01c0ec 
…1515) (#1626)

compiled out-of-tree (builddir != srcdir). (see also bpo-15366)
(cherry picked from commit dbdea62)
@Mariatta
Copy link
Copy Markdown
Member

Mariatta commented May 30, 2017

I removed needs backport to 3.5 and 3.6 labels because they were done.
Is backport still needed for 2.7?

@vstinner
Copy link
Copy Markdown
Member

vstinner commented May 18, 2018

@Mariatta: " Is backport still needed for 2.7?"

I removed this label: https://bugs.python.org/issue30273#msg317067

@jkloth jkloth deleted the issue30273 branch December 11, 2018 16:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vstinner vstinner vstinner left review comments

@brettcannon brettcannon Awaiting requested review from brettcannon

Assignees

@vstinner vstinner

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@jkloth @the-knights-who-say-ni @vstinner @Mariatta @brettcannon