Repository navigation
Resolve official uv self-update versions before axoupdater - #18674
Merged
Merged
Conversation
zsol
force-pushed
the
zsol/jj-molomyntlmzo
branch
from
March 23, 2026 17:51
4bc25a1 to
3a51035
Compare
zsol
marked this pull request as ready for review
March 23, 2026 18:08
zanieb
reviewed
Mar 23, 2026
zanieb
approved these changes
Mar 23, 2026
Member
|
We might want to continue to ban |
Member
|
Generally, the |
Member
Author
|
Alright, I'll add a check that ensures the version number roundtrips cleanly ( |
zsol
force-pushed
the
zsol/jj-molomyntlmzo
branch
from
March 23, 2026 19:32
e514256 to
d884aa8
Compare
zsol
enabled auto-merge (squash)
March 23, 2026 19:35
zsol
disabled auto-merge
March 23, 2026 19:37
zanieb
reviewed
Mar 23, 2026
zsol
force-pushed
the
zsol/jj-molomyntlmzo
branch
from
March 23, 2026 19:43
d884aa8 to
e8f3afe
Compare
zsol
enabled auto-merge (squash)
March 23, 2026 19:44
This was referenced Apr 26, 2026
woodruffw
added a commit
that referenced
this pull request
Apr 27, 2026
## Summary This is an attempt at fixing #19137. See #19139 (comment) for my understanding of the situation and motivation for this approach (versus the simpler approach in #19139). TL;DR: we were unconditionally appending `eabihf` to all libc variants when constructing `cargo dist`-style triplets. This was incorrect for a long time, but didn't surface on hot user paths until #18674 reused that pathway for uv's own self-upgrade logic. The fix is as simple as not doing that, _except_ that we _do_ want to do it in the bare `Gnu` and `Musl` cases, since those signal FP detection errors (and we optimistically assume the user really has a hardfloat environment). So now we emit the appropriate `Musleabi`/`Musleabihf` variants and specialize the append to just the FP detection failure cases for both `Gnu` and `Musl` explicitly. Closes #19137. Closes #19139. ## Test Plan Added a unit test demonstrating the new `as_cargo_dist_triple` behavior. --------- Signed-off-by: William Woodruff <william@astral.sh>
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
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.
This PR changes
uv self updateto use theuv.ndjsonhosted athttps://raw.githubusercontent.com/astral-sh/versions/main/v1/to resolve the desired uv version.This behavior change happens only if:
Important
Because of the move to pep440 version specifiers, this means that
uv self update 0.10will now resolve to0.10.0instead of failing. This is consistent withuvx uv@0.10behavior, but it isn't intuitive. We could consider failing such commands like before, but I chose consistency withuvx uv@0.10, because I'm planning to add version bounds (uv self update '<0.11') too, which would make it clearer that these are Python version strings.Towards #18503.
Test Plan
Happy path:
One of the many sad paths: