Avoid enforcing incorrect hash in mixed-hash settings #17157
Merged
+283
−35
Conversation
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
Member
Author
|
Alternatively, we can get rid of |
charliermarsh
temporarily deployed
to
uv-test-registries
GitHub Actions
Inactive
konstin
approved these changes
Dec 17, 2025
Member
konstin
left a comment
konstin
left a comment
There was a problem hiding this comment.
Can you add a test for that that mixed hashes situation where there's a SHA256 here and a SHA512 there?
Member
Author
|
Do you have any advice on how to do that easily? |
Member
|
A mockserver with a find links page that links to three entries in our |
charliermarsh
temporarily deployed
to
uv-test-registries
GitHub Actions
Inactive
woodruffw
added a commit
that referenced
this pull request
Dec 30, 2025
This reverts commit 6fa8204.
zanieb
added a commit
that referenced
this pull request
Dec 30, 2025
…id (#17265) Fixes a regression from #17157 as reported in #17260 Closes #17260 Closes #17263 You can see the regression test fail [here](https://github.com/astral-sh/uv/actions/runs/20599629637/job/59162043790?pr=17269) in #17269 which cherry-picks the commit adding tests without the fix.
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.
Summary
Right now, when we return a
Distfrom a lockfile, we concatenate all hashes for all distributions for a given package. In the case of #17143, I think that means we'll return the SHA256 from the sdist, plus the SHA512 from the wheel. If the wheel was previously installed (i.e., it's in the cache), and we computed the SHA256 at that point in time, thenHashed::has_digestswould returntruebecause we have at least one SHA256. We now limit the hashes to the distribution that we expect to install.Closes #17143.