Respect the user's upper-bound in `requires-python` by charliermarsh · Pull Request #6824 · astral-sh/uv

charliermarsh · 2024-08-29T16:59:13Z

Summary

We now respect the user-provided upper-bound in for requires-python. So, if the user has requires-python = "==3.11.*", we won't explore forks that have python_version >= '3.12', for example.

However, we continue to only compare the lower bounds when assessing whether a dependency is compatible with a given Python range.

Closes #6150.

konstin

We should check that this doesn't collide with #6268, otherwise, important improvement!

konstin · 2024-08-29T18:16:19Z

crates/uv-resolver/src/requires_python.rs

+
+impl From<RequiresPythonRange> for Range<Version> {
+    fn from(value: RequiresPythonRange) -> Self {
+        match (value.0.as_ref(), value.1.as_ref()) {


This should definitely be part of pubgrub, can you open an issue?

pubgrub-rs/pubgrub#253

konstin · 2024-08-29T18:16:41Z

crates/uv/tests/snapshots/ecosystem__warehouse-lock-file.snap

 ---
 version = 1
 requires-python = "==3.11.*"
-resolution-markers = [


BurntSushi

LGTM!

BurntSushi · 2024-08-29T18:20:11Z

We should check that this doesn't collide with #6268, otherwise, important improvement!

Yeah I was just talking to Charlie about this. I don't think it does.

This MR contains the following updates: | Package | Update | Change | |---|---|---| | [astral-sh/uv](https://github.com/astral-sh/uv) | patch | `0.4.0` -> `0.4.4` | 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.4.4`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#044) [Compare Source](astral-sh/uv@0.4.3...0.4.4) ##### Enhancements - Allow customizing the project environment path with `UV_PROJECT_ENVIRONMENT` ([#6834](astral-sh/uv#6834)) - Warn when `VIRTUAL_ENV` is set but will not be respected in project commands ([#6864](astral-sh/uv#6864)) - Add `--no-hashes` to `uv export` ([#6954](astral-sh/uv#6954)) - Make HTTP headers title case for backward compatibility ([#6887](astral-sh/uv#6887)) - Pin `.python-version` in `uv init` ([#6869](astral-sh/uv#6869)) - Support `file://` URLs for `UV_PYTHON_INSTALL_MIRROR` ([#6950](astral-sh/uv#6950)) - Introduce more docker tags for uv ([#6053](astral-sh/uv#6053)) ##### Bug fixes - Avoid canonicalizing the cache directory ([#6949](astral-sh/uv#6949)) - Show all PyPy versions in `uv python list --all-versions` ([#6917](astral-sh/uv#6917)) - Avoid incorrect `requires-python` marker simplifications ([#6268](astral-sh/uv#6268)) ##### Documentation - Add documentation for `UV_PROJECT_ENVIRONMENT` ([#6987](astral-sh/uv#6987)) - Add optional dependencies section to the lockfile document ([#6982](astral-sh/uv#6982)) - Document use of the `file://` scheme in Python installation mirrors ([#6984](astral-sh/uv#6984)) - Fix outdated references to the help menu documentation in the first steps page ([#6980](astral-sh/uv#6980)) - Show env option in CLI reference documentation ([#6863](astral-sh/uv#6863)) - Add bind mount example to `docker.md` ([#6921](astral-sh/uv#6921)) ### [`v0.4.3`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#043) [Compare Source](astral-sh/uv@0.4.2...0.4.3) ##### Enhancements - Show build backend output when `--verbose` is provided ([#6903](astral-sh/uv#6903)) - Allow `uv sync --frozen --package` without copying member `pyproject.toml` ([#6943](astral-sh/uv#6943)) ##### Bug fixes - Avoid panic with missing temporary directory ([#6929](astral-sh/uv#6929)) - Avoid updating incorrect dependencies for sorted `uv add` ([#6939](astral-sh/uv#6939)) - Use lower-bound semantics for all Python compatibility comparisons ([#6882](astral-sh/uv#6882)) ### [`v0.4.2`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#042) [Compare Source](astral-sh/uv@0.4.1...0.4.2) ##### Enhancements - Adding support for `.pyc` files in `uv run` ([#6886](astral-sh/uv#6886)) - Treat missing `top_level.txt` as non-fatal ([#6881](astral-sh/uv#6881)) ##### Bug fixes - Fix `is_disjoint` check for supported environments ([#6902](astral-sh/uv#6902)) - Remove dangling archives in `uv cache clean ${package}` ([#6915](astral-sh/uv#6915)) - Error when discovered Python is incompatible with `--isolated` workspace ([#6885](astral-sh/uv#6885)) - Warn when discovered Python is incompatible with PEP 723 script ([#6884](astral-sh/uv#6884)) ### [`v0.4.1`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#041) [Compare Source](astral-sh/uv@0.4.0...0.4.1) ##### Enhancements - Add `uv export --format requirements-txt` ([#6778](astral-sh/uv#6778)) - Allow `@` references in `uv tool install --from` ([#6842](astral-sh/uv#6842)) - Normalize version specifiers by sorting ([#6333](astral-sh/uv#6333)) - Respect the user's upper-bound in `requires-python` ([#6824](astral-sh/uv#6824)) - Use Windows registry to discover Python on Windows directly ([#6761](astral-sh/uv#6761)) - Hint at `--no-workspace` in `uv init` failures ([#6815](astral-sh/uv#6815)) - Update to last PyPy releases ([#6784](astral-sh/uv#6784)) ##### Bug fixes - Avoid deadlocks when multiple uv processes lock resources ([#6790](astral-sh/uv#6790)) - Expand tildes when matching against `PATH` ([#6829](astral-sh/uv#6829)) - Fix `uv init --no-project` alias ([#6837](astral-sh/uv#6837)) - Ignore pre-release segments when discovering via `requires-python` ([#6813](astral-sh/uv#6813)) - Support inline optional tables in `uv add` and `uv remove` ([#6787](astral-sh/uv#6787)) - Update default `hello.py` to pass `ruff format` ([#6811](astral-sh/uv#6811)) - Avoid stripping root for user path display ([#6865](astral-sh/uv#6865)) - Error when user-provided environments are disjoint with Python ([#6841](astral-sh/uv#6841)) - Retain alphabetical sorting for `pyproject.toml` in `uv add` operations ([#6388](astral-sh/uv#6388)))) ##### Documentation - Add a link to the multiple index docs in the alternative index guide ([#6826](astral-sh/uv#6826)) - Add docs for inline exclude newer in PEP 723 scripts ([#6831](astral-sh/uv#6831)) - Enumerate available Docker tags ([#6768](astral-sh/uv#6768)) - Omit `[pip]` section from configuration file docs ([#6814](astral-sh/uv#6814)) - Update `project.urls` in `pyproject.toml` ([#6844](astral-sh/uv#6844)) - Add docs for AWS CodeArtifact usage ([#6816](astral-sh/uv#6816)) ##### Other changes </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).

charliermarsh added the enhancement New feature or improvement to existing functionality label Aug 29, 2024

charliermarsh force-pushed the charlie/upper branch 2 times, most recently from 6a6e32b to e7f07e2 Compare August 29, 2024 18:04

charliermarsh marked this pull request as ready for review August 29, 2024 18:05

charliermarsh requested review from BurntSushi and konstin August 29, 2024 18:05

charliermarsh force-pushed the charlie/upper branch 2 times, most recently from 523a98e to ebeeaa8 Compare August 29, 2024 18:06

konstin approved these changes Aug 29, 2024

View reviewed changes

charliermarsh force-pushed the charlie/upper branch from ebeeaa8 to 69b9aac Compare August 29, 2024 18:19

BurntSushi approved these changes Aug 29, 2024

View reviewed changes

charliermarsh added 3 commits August 29, 2024 14:27

Respect the user's upper-bound in requires-python

cfd1e38

Try but tragically fail to use a real Range

ac639ba

Back to single range

00701a2

charliermarsh force-pushed the charlie/upper branch from 69b9aac to 00701a2 Compare August 29, 2024 18:29

charliermarsh enabled auto-merge (squash) August 29, 2024 18:32

charliermarsh merged commit 34d7450 into main Aug 29, 2024

charliermarsh deleted the charlie/upper branch August 29, 2024 18:37

BrewTestBot mentioned this pull request Aug 30, 2024

uv 0.4.1 Homebrew/homebrew-core#182978

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments

Respect the user's upper-bound in `requires-python`#6824

Respect the user's upper-bound in `requires-python`#6824
charliermarsh merged 3 commits intomainfrom
charlie/upper

charliermarsh commented Aug 29, 2024 •

edited

Loading

Uh oh!

konstin left a comment

Uh oh!

konstin Aug 29, 2024

Uh oh!

charliermarsh Aug 29, 2024

Uh oh!

konstin Aug 29, 2024

Uh oh!

BurntSushi left a comment

Uh oh!

BurntSushi commented Aug 29, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Comments

Conversation

charliermarsh commented Aug 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Uh oh!

konstin left a comment

Choose a reason for hiding this comment

Uh oh!

konstin Aug 29, 2024

Choose a reason for hiding this comment

Uh oh!

charliermarsh Aug 29, 2024

Choose a reason for hiding this comment

Uh oh!

konstin Aug 29, 2024

Choose a reason for hiding this comment

Uh oh!

BurntSushi left a comment

Choose a reason for hiding this comment

Uh oh!

BurntSushi commented Aug 29, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

charliermarsh commented Aug 29, 2024 •

edited

Loading