-
Notifications
You must be signed in to change notification settings - Fork 2.9k
Add support for package-level conflicts in workspaces
#14906
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
31 commits
Select commit
Hold shift + click to select a range
10d5ac1
uv-pypi-types: rename ConflictPackage to ConflictKind
BurntSushi 9026ff2
uv-pypi-types: add ConflictKind::Project
BurntSushi 7fba6b5
uv-resolver: support project-level conflicts
BurntSushi 1370e51
Merge branch 'main' into ag/package-level-conflict
zanieb dd410d0
Merge branch 'main' into ag/package-level-conflict
zanieb 6ca33c7
Fully support project level conflicts
BurntSushi c379db0
Update `detect_conflicts` to take a `InstallTarget`
zanieb d54792b
Add `packages` utility to `InstallTarget`
zanieb 95b6b20
Do not include conflicts for packages that will not be installed
zanieb 827708e
Add test cases, improve `packages()`, fix errors
zanieb 88eb0e9
Improve handling of package conflicts
zanieb 3c1057d
Log resolver environments
zanieb d46a0f2
Remove unused dependency
zanieb 9105464
Cleanup test
zanieb 41b576b
Add more test cases
zanieb a4eff02
CLippy
zanieb 3fea806
Add another extra test case
zanieb 8e41471
Remove test cases moved to https://github.com/astral-sh/uv/pull/14879
zanieb 05ce345
Revert "Log resolver environments"
zanieb a5ce1df
Update comments
zanieb fb0ca39
Expand comment
zanieb 49a75fa
Add preview warning
zanieb 22cce9d
Merge branch 'main' into zb/package-conflicts
zanieb 55360d3
Merge with preview flag work
zanieb 64a24f8
Merge branch 'main' into zb/package-conflicts
zanieb 7927fb3
Add preview feature list
zanieb 1dc7840
Fixup check
zanieb 92f7621
Review
zanieb 4e0d0ce
Merge branch 'main' into zb/package-conflicts
zanieb 3c63ddd
Merge branch 'main' into zb/package-conflicts
zanieb 9f23e5f
Merge branch 'main' into zb/package-conflicts
zanieb File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What's the thinking behind releasing this under a flag?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's in the summary
I'm just not sure we'll be able to meet our bar for correctness here in the first iteration.