Preserve lowered extra build dependencies#15038
Merged
charliermarsh merged 1 commit intomainfrom Aug 4, 2025
Merged
Conversation
charliermarsh
temporarily deployed
to
uv-test-registries
GitHub Actions
Inactive
charliermarsh
force-pushed
the
charlie/lower
branch
from
37a21d4 to
858039f
Compare
charliermarsh
commented
Aug 3, 2025
| pub struct ExtraBuildRequires { | ||
| pub extra_build_dependencies: ExtraBuildDependencies, | ||
| } | ||
| pub struct LoweredExtraBuildDependencies(ExtraBuildRequires); |
Member
Author
There was a problem hiding this comment.
This is a wrapper type, mostly to avoid circular dependencies. We want ExtraBuildRequires to be usable in the build dispatch traits, but those can't depend on uv-distribution (and yet we want the lowering logic to live here). This type doesn't really appear anywhere, except for the specific callsites that do the lowering -- they then call .into_inner and most things take `ExtraBuildRequires.
(We also use this pattern for at least one other type, LoweredRequirement.)
charliermarsh
temporarily deployed
to
uv-test-registries
GitHub Actions
Inactive
charliermarsh
commented
Aug 3, 2025
| // Lower the extra build dependencies, if any. | ||
| let extra_build_requires = | ||
| uv_distribution::ExtraBuildRequires::from_lowered(extra_build_dependencies.clone()); | ||
| LoweredExtraBuildDependencies::from_non_lowered(extra_build_dependencies.clone()) |
Member
Author
There was a problem hiding this comment.
I think these actually aren't lowered, unless I'm misunderstanding. This is distinctly different from scripts (which now use from_lowered), where we lower the dependencies ahead of time.
charliermarsh
force-pushed
the
charlie/lower
branch
from
858039f to
be3263d
Compare
charliermarsh
temporarily deployed
to
uv-test-registries
GitHub Actions
Inactive
zanieb
approved these changes
Aug 4, 2025
tmeijn
pushed a commit
to tmeijn/dotfiles
that referenced
this pull request
Aug 6, 2025
This MR contains the following updates: | Package | Update | Change | |---|---|---| | [astral-sh/uv](https://github.com/astral-sh/uv) | patch | `0.8.4` -> `0.8.5` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>astral-sh/uv (astral-sh/uv)</summary> ### [`v0.8.5`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#085) [Compare Source](astral-sh/uv@0.8.4...0.8.5) ##### Enhancements - Enable `uv run` with a GitHub Gist ([#​15058](astral-sh/uv#15058)) - Improve HTTP response caching log messages ([#​15067](astral-sh/uv#15067)) - Show wheel tag hints in install plan ([#​15066](astral-sh/uv#15066)) - Support installing additional executables in `uv tool install` ([#​14014](astral-sh/uv#14014)) ##### Preview features - Enable extra build dependencies to 'match runtime' versions ([#​15036](astral-sh/uv#15036)) - Remove duplicate `extra-build-dependencies` warnings for `uv pip` ([#​15088](astral-sh/uv#15088)) - Use "option" instead of "setting" in `pylock` warning ([#​15089](astral-sh/uv#15089)) - Respect extra build requires when reading from wheel cache ([#​15030](astral-sh/uv#15030)) - Preserve lowered extra build dependencies ([#​15038](astral-sh/uv#15038)) ##### Bug fixes - Add Python versions to markers implied from wheels ([#​14913](astral-sh/uv#14913)) - Ensure consistent indentation when adding dependencies ([#​14991](astral-sh/uv#14991)) - Fix handling of `python-preference = system` when managed interpreters are on the PATH ([#​15059](astral-sh/uv#15059)) - Fix symlink preservation in virtual environment creation ([#​14933](astral-sh/uv#14933)) - Gracefully handle entrypoint permission errors ([#​15026](astral-sh/uv#15026)) - Include wheel hashes from local Simple indexes ([#​14993](astral-sh/uv#14993)) - Prefer system Python installations over managed ones when `--system` is used ([#​15061](astral-sh/uv#15061)) - Remove retry wrapper when matching on error kind ([#​14996](astral-sh/uv#14996)) - Revert `h2` upgrade ([#​15079](astral-sh/uv#15079)) ##### Documentation - Improve visibility of copy and line separator in dark mode ([#​14987](astral-sh/uv#14987)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS41Mi4yIiwidXBkYXRlZEluVmVyIjoiNDEuNTIuMiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiUmVub3ZhdGUgQm90Il19-->
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
2 participants
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
I should've noticed this during review -- my bad -- but it looks like after lowering, we're converting back to
uv_pep508::Requirement. This is mostly okay, but it's lossy for some lowerings. For example, we lose index pinning. With this PR, we now preserve the lowered types (Requirement).Closes #15037.