Allow conflicting locals when forking #5104
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
ibraheemdev
force-pushed
the
ibraheem/fork-locals
branch
from
20a0b92
to
0c7ce71
Compare
ibraheemdev
force-pushed
the
ibraheem/fork-locals
branch
from
0c7ce71
to
8dffb13
Compare
BurntSushi
approved these changes
Jul 16, 2024
| @@ -23,23 +23,26 @@ pub(crate) struct PubGrubDependency { | |||
| /// even if this field is None where there is an override with a URL or there is a different | |||
| /// requirement or constraint for the same package that has a URL. | |||
| pub(crate) url: Option<VerbatimParsedUrl>, | |||
| /// The local version for this requirement, if specified. | |||
| pub(crate) local: Option<Version>, | |||
There was a problem hiding this comment.
Is it true that if local is Some, then Version::is_local will always be true?
If so, then perhaps this could just be a Version, and case analysis uses Version::is_local or Version::local.
There was a problem hiding this comment.
After reading through the PR, I retract my suggestion. I see how this is very convenient because the acquisition of a local-only Version is pretty naturally expressed via Option<Version>. And I don't think you ever look at a local and try to access its local segments, so there isn't really any redundant case analysis.
There was a problem hiding this comment.
Is it true that if local is Some, then Version::is_local will always be true?
This is actually not true, because we also extract local versions from direct URL/path requirements.
| # via torch | ||
| torch==2.0.0+cpu ; platform_machine != 'x86_64' | ||
| # via -r requirements.in | ||
| torch==2.0.0+cu118 ; platform_machine == 'x86_64' |
zanieb
pushed a commit
that referenced
this pull request
Jul 19, 2024
## Summary This fixes a few bugs introduced by #5104. I previously thought we could track conflicting locals the same way we track conflicting URLs in forks, but it turns out that ends up being very tricky. URL forks work because we prioritize directly URL requirements. We can't prioritize locals in the same way without conflicting with the URL prioritization (this may be possible but it's not trivial), so we run into issues where a correct resolution depends on the order in which dependencies are traversed. Instead, we track local versions across all forks in `Locals`. When applying a local version, we apply all locals with markers that intersect with the current fork. This way we end up applying some local versions without creating a fork. For example, given: ``` // pyproject.toml dependencies = [ "torch==2.0.0+cu118 ; platform_machine == 'x86_64'", ] // requirements.in torch==2.0.0 . ``` We choose `2.0.0+cu118` in all cases. However, if a disjoint fork is created based on local versions, the resolver will choose the most compatible local when it narrows to a specific fork. Thus we correctly respect local versions when forking: ``` // pyproject.toml dependencies = [ "torch==2.0.0+cu118 ; platform_machine == 'x86_64'", "torch==2.0.0+cpu ; platform_machine != 'x86_64'" ] // requirements.in torch==2.0.0 . ``` We should also be able to use a similar strategy for #5150. ## Test Plan This fixes #5220 locally for me, as well as a few other bugs that were not reported yet.
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.
Summary
Currently, the
Localstype relies on there being a single local version for a given package. With marker expressions this may not be true, a similar problem to #4435. This changes theLocalstype toForkLocals, which tracks locals for a given fork. Local versions are now tracked onPubGrubRequirementbefore forking.Resolves #4580.