Respect sentinels in prioritization #10443
Merged
+45
−35
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/sentinel
branch
from
474f1bd to
696e954
Compare
charliermarsh
commented
Jan 9, 2025
| @@ -162,8 +162,6 @@ impl VersionMap { | |||
| range: &Ranges<Version>, | |||
| ) -> impl DoubleEndedIterator<Item = (&Version, VersionMapDistHandle)> { | |||
| // Performance optimization: If we only have a single version, return that version directly. | |||
| // | |||
| // TODO(charlie): Now that we use local version sentinels, does this ever trigger? | |||
There was a problem hiding this comment.
It does... Proxy packages use Ranges::singleton, which hits this path.
charliermarsh
force-pushed
the
charlie/sentinel
branch
from
696e954 to
1606c20
Compare
zanieb
approved these changes
Jan 9, 2025
charliermarsh
force-pushed
the
charlie/sentinel
branch
2 times, most recently
from
6335f75 to
6ac2113
Compare
charliermarsh
force-pushed
the
charlie/sentinel
branch
from
6ac2113 to
fff5a18
Compare
charliermarsh
commented
Jan 9, 2025
| @@ -178,9 +178,7 @@ impl PubGrubPriorities { | |||
| // The ConflictEarly` match avoids infinite loops. | |||
| if matches!( | |||
| entry.get(), | |||
| PubGrubPriority::ConflictLate(_) | |||
| | PubGrubPriority::ConflictEarly(_) | |||
| | PubGrubPriority::Singleton(_) | |||
There was a problem hiding this comment.
@konstin -- Heads up, I removed this... Otherwise, the wrong_backtracking_basic test failed. I think it succeeded by accident before? Since all the conflicts are in singletons.
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
If a user provides a constraint like
flask==3.0.0, that gets expanded to[3.0.0, 3.0.0+[max]). So it's not a singleton, but it should be treated as such for the purposes of prioritization, since in practice it will almost always map to a single version.