Fix pex3 lock subset.
#2684
Merged
Fix pex3 lock subset.
#2684
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
Lock subsetting could crash previously. Also fix
`pex3 lock {create,sync,update} --elide-unused-requires-dist`, which
would not crash, but would fail to elide some dists.
Fixes pex-tool#2683
jsirois
commented
Feb 15, 2025
Comment on lines
+55
to
+92
| python_full_versions = ( | ||
| list(iter_compatible_versions(requires_python)) if requires_python else [] | ||
| ) | ||
| python_versions = OrderedSet( | ||
| python_full_version[:2] for python_full_version in python_full_versions | ||
| ) | ||
|
|
||
| os_names = [] | ||
| platform_systems = [] | ||
| sys_platforms = [] | ||
| for target_system in target_systems: | ||
| if target_system is TargetSystem.LINUX: | ||
| os_names.append("posix") | ||
| platform_systems.append("Linux") | ||
| sys_platforms.append("linux") | ||
| sys_platforms.append("linux2") | ||
| elif target_system is TargetSystem.MAC: | ||
| os_names.append("posix") | ||
| platform_systems.append("Darwin") | ||
| sys_platforms.append("darwin") | ||
| elif target_system is TargetSystem.WINDOWS: | ||
| os_names.append("nt") | ||
| platform_systems.append("Windows") | ||
| sys_platforms.append("win32") | ||
|
|
||
| return cls( | ||
| extras=frozenset(ProjectName(extra) for extra in (extras or [""])), | ||
| os_names=frozenset(os_names), | ||
| platform_systems=frozenset(platform_systems), | ||
| sys_platforms=frozenset(sys_platforms), | ||
| python_versions=frozenset( | ||
| Version(".".join(map(str, python_version))) for python_version in python_versions | ||
| ), | ||
| python_full_versions=frozenset( | ||
| Version(".".join(map(str, python_full_version))) | ||
| for python_full_version in python_full_versions | ||
| ), | ||
| ) |
There was a problem hiding this comment.
This expansion from extras to include os_names, platform_systems, sys_platforms, python_versions and python_full_versions plugs the holes for --style universal locks where these markers are faked. As noted here: #2647 (comment)
There was a problem hiding this comment.
@huonw I just added you FYI since you reviewed the initial feature add. Although it does not appear Pants uses this yet, a Pants user has done so on their own uncovering this huge hole. I'm going to proceed with a release to get @lecardozo the fix.
There was a problem hiding this comment.
Thank you for the FYI! And for fixing the bugs!
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.
Lock subsetting could crash previously. Also fix
pex3 lock {create,sync,update} --elide-unused-requires-dist, whichwould not crash, but would fail to elide some dists.
Fixes #2683