Skip to content

Fix detection of sorted dependencies when include-group is used#13354

Merged
charliermarsh merged 4 commits intoastral-sh:mainfrom
RazerM:feature/uv-add-sorted-with-include-group
May 10, 2025
Merged

Fix detection of sorted dependencies when include-group is used#13354
charliermarsh merged 4 commits intoastral-sh:mainfrom
RazerM:feature/uv-add-sorted-with-include-group

Conversation

@RazerM
Copy link
Contributor

@RazerM RazerM commented May 8, 2025

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 behind deps.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

Loading
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants