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

Support de-vendoring for installs. #666

Merged
merged 5 commits into from Feb 7, 2019
Merged

Conversation

jsirois
Copy link
Member

@jsirois jsirois commented Feb 6, 2019

Now that pex vendors setuptools and wheel, we build / install sdists with
potentially fragile import semantics for these two distributions. In
particular, we trip up against this when trying to build cryptography.

Robustify installs by de-vendoring setuptools and wheel when used in an
install context. In order to support de-vendoring make the method of
import conditional on an environment variable instead of attempting to
re-write vendored imports at runtime.

Fixes #661

Now that pex vendors setuptools and wheel, we build / install sdists with
potentially fragile import semantics for these two distributions. In
particular, we trip up against this when trying to build cryptography.

Robustify installs by de-vendoring setuptools and wheel when used in an
install context. In order to support de-vendoring make the method of
import conditional on an environment variable instead of attempting to
re-write vendored imports at runtime.

Fixes pex-tool#661
@jsirois
Copy link
Member Author

jsirois commented Feb 7, 2019

Reviewers: the 3 commits can bew reviewed seperately and the 1st commit was automatically generated via tox -evendor so can generally be ignored.

Remove some now unused code, add docs, fix doc typos.
@jsirois
Copy link
Member Author

jsirois commented Feb 7, 2019

Alright - hands-off from me with the last cleanup commit. Ignoring the 1st machine-generated commit things stand at:

$ git diff --shortstat HEAD~3
 12 files changed, 209 insertions(+), 225 deletions(-)

Copy link
Collaborator

@benjyw benjyw left a comment

Choose a reason for hiding this comment

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

Excellent!

Copy link
Contributor

@Eric-Arellano Eric-Arellano left a comment

Choose a reason for hiding this comment

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

Great find on how to fix this!

.travis.yml Show resolved Hide resolved
pex/commands/bdist_pex.py Show resolved Hide resolved
tests/test_bdist_pex.py Show resolved Hide resolved
tests/test_bdist_pex.py Show resolved Hide resolved
@jsirois jsirois merged commit 5f19c91 into pex-tool:master Feb 7, 2019
@jsirois jsirois deleted the issues/661 branch February 7, 2019 21:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants