Prefer local variants in preference selection #11546
Merged
+448
−5
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
charliermarsh
force-pushed
the
charlie/local-pref
branch
2 times, most recently
from
e01230d to
1e03f0b
Compare
charliermarsh
force-pushed
the
charlie/local-pref
branch
from
1e03f0b to
55181cc
Compare
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
This PR fixes a subtle issue arising from our propagation of preferences. When we resolve a fork, we take the solution from that fork and mark all the chosen versions as "preferred" as we move on to the next fork.
In this specific case, the resolver ended up solving a macOS-specific fork first, which led us to pick
2.6.0rather than2.6.0+cpu. This in itself is correct; but when we moved on to the next fork, we preferred2.6.0over2.6.0+cpu, despite the fact that2.6.0only includes macOS wheel, and that branch was focused on Linux.Now, in preferences, we prefer local variants (if they exist). If the local variant ends up not working, we'll presumedly backtrack to the base version anyway.
Closes #11406.