Fix detection of sorted dependencies when include-group is used#13354
Merged
charliermarsh merged 4 commits intoastral-sh:mainfrom May 10, 2025
Merged
Conversation
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 follows on from #13334 to fix another case.
Summary
If a dependency group contained any
{ include-group = "..." }entries, the sort detection would bail out. The root cause of the problem was gating the sort detection behinddeps.iter().all(Value::is_str).A public code search reveals that keeping include-groups at the top is by far the most common, but keeping them at the bottom isn't uncommon. In both of these cases, uv will now preserve the convention that is in use.
Unless I've missed it, I don't think uv supports
uv adding an include-group, and so that wasn't tested here.Test Plan
cargo test