Improve display of ranges when pre-releases are not allowed by zanieb · Pull Request #9944 · astral-sh/uv

zanieb · 2024-12-16T21:35:48Z

There are two changes here

We now exclude pre-releases (if they are not allowed) from the available versions set when simplifying ranges, this means the simplified range reflects the allowed available versions — which is what we want. We no longer segment ranges into arbitrary looking segments..
We improve on Fix redundant enumeration of all package versions in some resolver errors #9885, expanding the scope to avoid regressions where we would now otherwise enumerate a bunch of versions

zanieb · 2024-12-16T22:09:30Z

crates/uv-resolver/src/error.rs

+                    // If the range in the conclusion (terms) matches the range of no versions,
+                    // then we'll drop this node. If the range is "all versions", then there's no
+                    // also no  need to enumerate the available versions.
+                    if *term != Range::full() && *term != versions {


This change extends #9885 to apply to https://github.com/astral-sh/uv/pull/9944/files#diff-4decbdad65ae6c2e77b162950bc1a15907dacaff952fcee61559704bf370fb06R2172 which would now otherwise enumerate all the anyio versions

crates/uv/tests/it/pip_install_scenarios.rs

zanieb · 2024-12-16T22:17:40Z

crates/uv-resolver/src/error.rs

+    let any_prerelease = range.iter().any(|(start, end)| {
+        let is_pre1 = match start {
+            Bound::Included(version) => version.any_prerelease(),
+            Bound::Excluded(version) => version.any_prerelease(),
+            Bound::Unbounded => false,
+        };
+        let is_pre2 = match end {
+            Bound::Included(version) => version.any_prerelease(),
+            Bound::Excluded(version) => version.any_prerelease(),
+            Bound::Unbounded => false,
+        };
+        is_pre1 || is_pre2
+    });


Needed for #9944 (comment)

zanieb · 2024-12-16T22:22:14Z

Related #751 - but that needs a reproduction before I can close it.

konstin

good idea

crates/uv-resolver/src/error.rs

Co-authored-by: konsti <[email protected]>

This MR contains the following updates: | Package | Update | Change | |---|---|---| | [astral-sh/uv](https://github.com/astral-sh/uv) | patch | `0.5.8` -> `0.5.11` | 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.5.11`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#0511) [Compare Source](astral-sh/uv@0.5.10...0.5.11) ##### Enhancements - Normalize `platform_system` to `sys_platform` ([#9949](astral-sh/uv#9949)) - Improve retry mechanisms on Windows for `copy_atomic` and `write_atomic` ([#10026](astral-sh/uv#10026)) - Add nuance to prefetch logging ([#9984](astral-sh/uv#9984)) - Update to [`python-build-standalone 20241219`](https://github.com/astral-sh/python-build-standalone/releases/tag/20241219) ##### Preview features - Build backend: Preserve executable bits for scripts in distributions ([#10027](astral-sh/uv#10027)) - Build backend: Handle case where `metadata_directory` already contains `dist-info` directory ([#10005](astral-sh/uv#10005)) ##### Performance - Batch resolver pre-fetches per fork ([#10029](astral-sh/uv#10029)) ##### Bug fixes - Allow `--script` to be provided with `uv run -` ([#10035](astral-sh/uv#10035)) - Allow `uv run` arguments when reading from `stdin` ([#10034](astral-sh/uv#10034)) - Prefer higher Python lower-bounds when forking ([#10007](astral-sh/uv#10007)) - Remove references to deprecated `first-match` ([#10036](astral-sh/uv#10036)) ##### Documentation - Add `uv python install --preview` to the documentation ([#10010](astral-sh/uv#10010)) - Fix `uv python install --default` note about multiple requests ([#10011](astral-sh/uv#10011)) - Fix typo in Caching docs ([#10032](astral-sh/uv#10032)) - Remove remaining references to deprecated `first-match` ([#10038](astral-sh/uv#10038)) - Supplement missing separators for `UV_INSTALL_DIR` directions on Windows ([#9507](astral-sh/uv#9507)) ### [`v0.5.10`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#0510) [Compare Source](astral-sh/uv@0.5.9...0.5.10) ##### Enhancements - Improve backtracking behavior when packages conflict repeatedly ([#9843](astral-sh/uv#9843)) - Patch Python `sysconfig` values such as `AR` at `ar` install time ([#9905](astral-sh/uv#9905)) - Patch Python `sysconfig` values such as `clang` to `cc` at install time ([#9916](astral-sh/uv#9916)) - Skip `--native-tls` in `pip compile` header ([#9913](astral-sh/uv#9913)) - Add resolver error hint for no-binary and no-build failures ([#9948](astral-sh/uv#9948)) - Improve build error messages ([#9660](astral-sh/uv#9660)) - Reduce redundant Python version incompatibilities in resolver error message ([#9957](astral-sh/uv#9957)) - Reduce redundant enumeration of all package versions in some resolver errors ([#9885](astral-sh/uv#9885)) - Improve display of ranges when pre-releases are not allowed ([#9944](astral-sh/uv#9944)) - Improve error messages for `uv remove` ([#9959](astral-sh/uv#9959)) - Improve phrasing for single term incompatibilities ([#9953](astral-sh/uv#9953)) - Improve styling of `uv remove` dependency hints ([#9960](astral-sh/uv#9960)) - Omit trailing zeros on Python requirements inferred from versions ([#9952](astral-sh/uv#9952)) - Show a concise error message for missing `version` field ([#9912](astral-sh/uv#9912)) - Use the build options value to improve hints for no wheel / source distribution errors ([#9950](astral-sh/uv#9950)) ##### Bug fixes - Allow multiple disjoint URLs in overrides ([#9893](astral-sh/uv#9893)) - Include explicit indexes in publish index choice ([#9932](astral-sh/uv#9932)) - Fix Python interpreter detection for 32-bit operating systems on 64-bit hosts ([#9970](astral-sh/uv#9970)) ##### Documentation - Fix typo "operation system" ([#9971](astral-sh/uv#9971)) - Clarify uninstallation docs ([#9938](astral-sh/uv#9938)) - Add a note to say that dependencies between workspace members are editable ([#9363](astral-sh/uv#9363)) - Correctly document default value of `fork-strategy` setting ([#9931](astral-sh/uv#9931)) - Use double quotes for Windows support in examples ([#9946](astral-sh/uv#9946)) - Remove `pypy` from top-level pin example ([#9896](astral-sh/uv#9896)) - Update references to `python-build-standalone` to reflect the transferred project ([#9977](astral-sh/uv#9977)) - Use a different Ruff version in documentation ([#9943](astral-sh/uv#9943)) - Change example so it works as-is on `powershell` and `cmd.exe` ([#9903](astral-sh/uv#9903)) - Clarify best practice for Python matrix strategy in GitHub Actions ([#9454](astral-sh/uv#9454)) - Add documentation for `uv-lock` and `uv-export` pre-commit hooks ([#9872](astral-sh/uv#9872)) ##### Preview features - Build backend: Fix pre-PEP 639 license files ([#9965](astral-sh/uv#9965)) ### [`v0.5.9`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#059) [Compare Source](astral-sh/uv@0.5.8...0.5.9) ##### Enhancements - Fork version selection based on `requires-python` requirements ([#9827](astral-sh/uv#9827)) - Patch `sysconfig` data at install time ([#9857](astral-sh/uv#9857)) - Remove `-isysroot` when patching sysconfig ([#9860](astral-sh/uv#9860)) ##### Configuration - Introduce a `--fork-strategy` preference mode ([#9868](astral-sh/uv#9868)) - Add support for `UV_OFFLINE` ([#9795](astral-sh/uv#9795)) ##### Bug fixes - Avoid `panic!()` when current directory does not exist ([#9876](astral-sh/uv#9876)) - Avoid reusing interpreter metadata when running under Rosetta ([#9846](astral-sh/uv#9846)) - Avoid trailing slash when deserializing from lockfile ([#9848](astral-sh/uv#9848)) - Fix bug in terms when collapsing unavailable versions in resolver errors ([#9877](astral-sh/uv#9877)) - Fix suggestion to use `uv help python` on invalid install requests ([#9820](astral-sh/uv#9820)) - Skip root when assessing prefix viability ([#9823](astral-sh/uv#9823)) - Avoid spurious 'Upgraded tool environment' in `uv tool upgrade` ([#9870](astral-sh/uv#9870)) ##### Rust API - Upgrade minimum Rust version to 1.83 ([#9815](astral-sh/uv#9815)) ##### Documentation - Document the `--fork-strategy` setting ([#9887](astral-sh/uv#9887)) ##### Preview features - Build backend: Allow underscores in entrypoints ([#9825](astral-sh/uv#9825)) </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. --- - [ ] If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).

zanieb force-pushed the zb/prerelease-ranges branch from 327993e to b13a2ce Compare December 16, 2024 22:08

zanieb commented Dec 16, 2024

View reviewed changes

crates/uv/tests/it/pip_install_scenarios.rs Outdated Show resolved Hide resolved

zanieb force-pushed the zb/prerelease-ranges branch from b13a2ce to 5713a31 Compare December 16, 2024 22:17

zanieb commented Dec 16, 2024

View reviewed changes

zanieb marked this pull request as ready for review December 16, 2024 22:17

zanieb requested a review from charliermarsh December 16, 2024 23:57

Base automatically changed from zb/simplify to main December 17, 2024 01:42

zanieb force-pushed the zb/prerelease-ranges branch from 5713a31 to 287cabe Compare December 17, 2024 01:43

zanieb added the error messages Messaging when something goes wrong label Dec 17, 2024

zanieb force-pushed the zb/prerelease-ranges branch from 287cabe to 169df5d Compare December 17, 2024 15:55

zanieb requested a review from konstin December 17, 2024 15:56

konstin approved these changes Dec 17, 2024

View reviewed changes

crates/uv-resolver/src/error.rs Outdated Show resolved Hide resolved

zanieb and others added 2 commits December 17, 2024 10:53

Improve display of ranges when pre-releases are not allowed

311cad1

Update crates/uv-resolver/src/error.rs

5cbb9ac

Co-authored-by: konsti <[email protected]>

zanieb force-pushed the zb/prerelease-ranges branch from 494ad2e to 5cbb9ac Compare December 17, 2024 16:53

zanieb enabled auto-merge (squash) December 17, 2024 16:54

zanieb merged commit 515d72c into main Dec 17, 2024

zanieb deleted the zb/prerelease-ranges branch December 17, 2024 17:05

BrewTestBot mentioned this pull request Dec 17, 2024

uv 0.5.10 Homebrew/homebrew-core#201571

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments

Improve display of ranges when pre-releases are not allowed#9944

Improve display of ranges when pre-releases are not allowed#9944
zanieb merged 2 commits intomainfrom
zb/prerelease-ranges

zanieb commented Dec 16, 2024 •

edited

Loading

Uh oh!

zanieb Dec 16, 2024 •

edited

Loading

Uh oh!

Uh oh!

zanieb Dec 16, 2024

Uh oh!

zanieb commented Dec 16, 2024

Uh oh!

konstin left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Comments

Conversation

zanieb commented Dec 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

zanieb Dec 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

zanieb Dec 16, 2024

Choose a reason for hiding this comment

Uh oh!

zanieb commented Dec 16, 2024

Uh oh!

konstin left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

zanieb commented Dec 16, 2024 •

edited

Loading

zanieb Dec 16, 2024 •

edited

Loading