-
-
Notifications
You must be signed in to change notification settings - Fork 646
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
Fix a bug in the python venv export logic. #15294
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -217,6 +217,12 @@ def __post_init__(self): | |
f"Given platform constraints {self.platforms} for internal only pex request: " | ||
f"{self}." | ||
) | ||
if self.internal_only and self.complete_platforms: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We check this for platforms above, but neglected to check it for complete_platforms. |
||
raise ValueError( | ||
"Internal only PEXes can only constrain interpreters with interpreter_constraints." | ||
f"Given complete_platform constraints {self.complete_platforms} for internal only " | ||
f"pex request: {self}." | ||
) | ||
if self.python and self.platforms: | ||
raise ValueError( | ||
"Only one of platforms or a specific interpreter may be set. Got " | ||
|
@@ -347,6 +353,7 @@ async def build_pex( | |
# `--interpreter-constraint` only makes sense in the context of building locally. These two | ||
# flags are mutually exclusive. See https://github.com/pantsbuild/pex/issues/957. | ||
if request.platforms or request.complete_platforms: | ||
# Note that this means that this is not an internal-only pex. | ||
# TODO(#9560): consider validating that these platforms are valid with the interpreter | ||
# constraints. | ||
argv.extend(request.platforms.generate_pex_arg_list()) | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This interpreter was not the one being used in practice! This was the legacy of the previous implementation.