Fix pex3 lock export: re-use --lock resolver.
#1831
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
Previously the lock export utility was using out-dated logic from the early days of the lock project. Extract a `subset` operation from the lock resolver and have it and lock export share that code. Also properly plumb lock export target selection and validation of exactly one target with updated help and error messages to make it clear that locks can only be exported for a single target. Fixes pex-tool#1826 Closes pex-tool#1645
jsirois
commented
Jul 8, 2022
| ): | ||
| # type: (...) -> Union[SubsetResult, Error] | ||
|
|
||
| with TRACER.timed("Parsing requirements"): |
There was a problem hiding this comment.
This was extracted from the lock_resolver here: https://github.com/pantsbuild/pex/pull/1831/files#diff-aad7222a03ff8182eb9c406092214ea24c7811b23dbdb9f47bfedc85aab327d0L240
jsirois
commented
Jul 8, 2022
| @@ -123,39 +115,3 @@ def extract_requirement(req): | |||
| locked_resolves = attr.ib() # type: SortedTuple[LockedResolve] | |||
| local_project_requirement_mapping = attr.ib(eq=False) # type: Mapping[str, Requirement] | |||
| source = attr.ib(default=None, eq=False) # type: Optional[str] | |||
|
|
|||
| def select(self, targets): | |||
There was a problem hiding this comment.
This was the entry-point to the out-dated lock selection logic export (and update) were using. Now all removed.
jsirois
commented
Jul 8, 2022
| update_requests = [ | ||
| ResolveUpdateRequest(target=target, locked_resolve=locked_resolve) | ||
| for target, locked_resolve in lock_file.select(targets.unique_targets()) | ||
| ResolveUpdateRequest( |
There was a problem hiding this comment.
<- And this was the flip-over from the out-dated lock selection logic for lock update which came along for the ride so I could nuke the outdated logic wholesale. The existing update test still pass, vetting this.
asherf
approved these changes
Jul 8, 2022
|
Heads up that I'll need 1 more review. Asher took a look, but I'll need maintainer sign off too. |
benjyw
approved these changes
Jul 9, 2022
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 the lock export utility was using out-dated logic from the
early days of the lock project. Extract a
subsetoperation from thelock resolver and have it and lock export share that code.
Also properly plumb lock export target selection and validation of
exactly one target with updated help and error messages to make it clear
that locks can only be exported for a single target.
Fixes #1826
Closes #1645