Cleanup bootstrap dependencies before handoff. #542
Merged
Conversation
This file contains 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
|
Now with full test coverage for all for terminal entry points to executing user code. It's probably worth noting the new PEX_VERBOSE=1 output: |
kwlzn
approved these changes
Aug 21, 2018
pex/pex.py
Outdated
| @@ -415,6 +410,40 @@ def _execute(self): | |||
| TRACER.log('No entry point specified, dropping into interpreter') | |||
| return self.execute_interpreter() | |||
|
|
|||
| @classmethod | |||
| @contextmanager | |||
There was a problem hiding this comment.
any point to keeping this as a contextmanager if it doesn't snapshot and restore prior sys.path state? as a caller, I'd expect the contextmgr to undo any mutations vs purely apply them and do nothing upon context block exit.
There was a problem hiding this comment.
Nope. I did start off re-jiggering in finally until I realized it was not needed. I'll fix. The patch_sys has this problem too.
There was a problem hiding this comment.
Worth another look - I stripped the contextmanagers from this class. Only one tried to restore anything (patch_pkg_resources) and the restoration was not needed for the pex handling of teardown.
|
OK - rebased past conflicts in master. PTAL at 457bc90. |
Previously we polluted the third party import space with any third party dependencies of the pex bootstrap code (currently a subset of setuptools). We now unimport all third_party code in bootstrap and place bootstrap at the end of `sys.path` before handing off to user code to allow their custom versions of overlapping third party code to be imported. Added a failing test that the demoted_bootstrap code now fixes. Fixes pex-tool#437.
We had a few of this operating in the leadup to hand-off to user code.
|
Another rebase past conflicts in master @ a972cb2. I'll submit by end of day unless there are objections. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Previously we polluted the third party import space with any third
party dependencies of the pex bootstrap code (currently a subset of
setuptools). We now unimport all third_party code in bootstrap and
place bootstrap at the end of
sys.pathbefore handing off to usercode to allow their custom versions of overlapping third party code
to be imported.
Added a failing test that the demoted_bootstrap code now fixes.
Fixes #437.