Support specifying a named resolve as the superset in a PexRequirements. #18397
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
This named resolve must be a user resolve defined in [python].resolves. This will allow us to move towards specifying a user resolve as the source to resolve a tool from. We can't use the existing LoadedLockfile superset for this, because we don't have access to the PythonSetup subsystem (which provides the list of resolves) when we construct the PexRequirements for a tool, so we don't know which lockfile the name corresponds to.
benjyw
commented
Mar 3, 2023
| @@ -433,26 +437,28 @@ async def _setup_pex_requirements( | |||
| pip_resolver_args = [*resolve_config.pex_args(), "--resolver-version", "pip-2020-resolver"] | |||
|
|
|||
| if isinstance(request.requirements, EntireLockfile): | |||
| lockfile = await Get(LoadedLockfile, LoadedLockfileRequest(request.requirements.lockfile)) | |||
| loaded_lockfile = await Get( | |||
There was a problem hiding this comment.
This rename is good for clarity, but was also necessary to avoid a mypy error, since we reuse this var name below.
benjyw
commented
Mar 3, 2023
| # A named resolve for a "user lockfile". | ||
| # Soon to be the only kind of lockfile, as this class will help | ||
| # get rid of the "tool lockfile" concept. | ||
| name: str |
There was a problem hiding this comment.
After we get rid of tool lockfiles we may be able to pare the lockfile-related types (Resolve, ChosenPythonResolve, Lockfile, LoadedLockfileRequest, LoadedLockfile, EntireLockfile) down substantially.
kaos
approved these changes
Mar 3, 2023
| @@ -608,7 +619,7 @@ async def build_pex( | |||
| ) | |||
|
|
|||
|
|
|||
| def _build_pex_description(request: PexRequest) -> str: | |||
| def _build_pex_description(request: PexRequest, resolve_to_lockfile: dict[str, str]) -> str: | |||
There was a problem hiding this comment.
Suggested change
| def _build_pex_description(request: PexRequest, resolve_to_lockfile: dict[str, str]) -> str: | |
| def _build_pex_description(request: PexRequest, resolve_to_lockfile: Mapping[str, str]) -> str: |
jsirois
approved these changes
Mar 3, 2023
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.
This named resolve must be a user resolve defined in [python].resolves.
This will allow us to move towards specifying a user resolve as the source to resolve a tool from. We can't use the existing LoadedLockfile superset for this, because we don't have access to the PythonSetup subsystem (which provides the list of resolves) when we construct the PexRequirements for a tool, so we don't know which lockfile the name corresponds to.