Add support for `package`-level conflicts in workspaces #14906
zanieb
merged
31 commits into
main
from
zb/package-conflicts
uv-pypi-types: rename ConflictPackage to ConflictKind
10d5ac1e
uv-pypi-types: add ConflictKind::Project
9026ff23
uv-resolver: support project-level conflicts
7fba6b5c
Merge branch 'main' into ag/package-level-conflict
1370e51b
Merge branch 'main' into ag/package-level-conflict
dd410d0b
Fully support project level conflicts
6ca33c71
Update `detect_conflicts` to take a `InstallTarget`
c379db0c
Add `packages` utility to `InstallTarget`
d54792bc
Do not include conflicts for packages that will not be installed
95b6b20f
Add test cases, improve `packages()`, fix errors
827708e6
Improve handling of package conflicts
88eb0e94
Log resolver environments
3c1057d6
Remove unused dependency
d46a0f24
Cleanup test
9105464a
Add more test cases
41b576b4
CLippy
a4eff025
Add another extra test case
3fea8066
Remove test cases moved to https://github.com/astral-sh/uv/pull/14879
8e414718
Revert "Log resolver environments"
05ce3456
Update comments
a5ce1df3
Expand comment
fb0ca39c
Add preview warning
49a75fa7
Merge branch 'main' into zb/package-conflicts
22cce9dd
Merge with preview flag work
55360d37
Merge branch 'main' into zb/package-conflicts
64a24f8e
Add preview feature list
7927fb3e
Fixup check
1dc78400
Review
92f7621c
charliermarsh
approved these changes
on 2025-08-04
Merge branch 'main' into zb/package-conflicts
4e0d0cee
Merge branch 'main' into zb/package-conflicts
3c63ddd3
zanieb
changed the title
Merge branch 'main' into zb/package-conflicts
9f23e5f0
Login to write a write a comment.
Login via GitHub