Ignore inferred conflict marker when determining if lockfile is up-to-date#15884
Draft
Ignore inferred conflict marker when determining if lockfile is up-to-date#15884
Conversation
zanieb
commented
Sep 16, 2025
Comment on lines
11057
to
+11058
| Resolved 5 packages in [TIME] | ||
| error: Groups `dev` and `magic` are incompatible with the transitively inferred conflicts: {`example:dev`, `example:magic`} | ||
| error: Groups `dev` and `magic` are incompatible with the declared conflicts: {`example:dev`, `example:magic`} |
Member
Author
There was a problem hiding this comment.
Unfortunately this regresses the error message, I'll need to investigate that further.
Member
Author
There was a problem hiding this comment.
Presumably the problem is that we're installing from the lockfile instead of a fresh resolution, which drops this information.
I think there are a few options here
- Read the pyproject.toml to determine if the conflict is transitive
- Change the encoding in the lockfile to avoid flattening nested groups
- Add a marker to the lockfile to indicate a transitive conflict is present
- Drop this special-case entirely
I sort of argue for (4), while we might want (2) or (3) in the future, they seem like a fair bit of work and the improvement in the error message is quite minor.
zanieb
commented
Sep 16, 2025
Comment on lines
+10998
to
+11005
| uv_snapshot!(context.filters(), context.lock().arg("--check"), @r" | ||
| success: true | ||
| exit_code: 0 | ||
| ----- stdout ----- | ||
|
|
||
| ----- stderr ----- | ||
| Resolved 5 packages in [TIME] | ||
| "); |
Member
Author
There was a problem hiding this comment.
You can see the failure from the issue in 44522f0
zanieb
temporarily deployed
to
uv-test-registries
GitHub Actions
Inactive
This was referenced Sep 16, 2025
zanieb
added a commit
that referenced
this pull request
Oct 1, 2025
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Closes #15869