Fix handling of changes to `requires-python` by BurntSushi · Pull Request #14076 · astral-sh/uv

BurntSushi · 2025-06-16T14:50:51Z

When using uv lock --upgrade-package=python after changing
requires-python, it was possible to get into a state where the fork
markers produced corresponded to the empty set. This in turn resulted in
an empty lock file.

There was already some infrastructure in place that I think was perhaps
intended to handle this. In particular, Lock::check_marker_coverage
checks whether the fork markers have some overlap with the supported
environments (including the requires-python). But there were two
problems with this.

First is that in lock validation, this marker coverage check came
after a path that returned Preferable (meaning that the fork markers
should be kept) when --upgrade-package was used. Second is that the
marker coverage check used the requires-python in the lock file and
not the requires-python in the now updated pyproject.toml.

We attempt to solve this conundrum by slightly re-arranging lock file
validation and by explicitly checking whether the new
requires-python is disjoint from the fork markers in the lock file. If
it is, then we return Versions from lock file validation (indicating
that the fork markers should be dropped).

Fixes #13951

When using `uv lock --upgrade-package=python` after changing `requires-python`, it was possible to get into a state where the fork markers produced corresponded to the empty set. This in turn resulted in an empty lock file. There was already some infrastructure in place that I think was perhaps intended to handle this. In particular, `Lock::check_marker_coverage` checks whether the fork markers have some overlap with the supported environments (including the `requires-python`). But there were two problems with this. First is that in lock validation, this marker coverage check came _after_ a path that returned `Preferable` (meaning that the fork markers should be kept) when `--upgrade-package` was used. Second is that the marker coverage check used the `requires-python` in the lock file and _not_ the `requires-python` in the now updated `pyproject.toml`. We attempt to solve this conundrum by slightly re-arranging lock file validation and by explicitly checking whether the *new* `requires-python` is disjoint from the fork markers in the lock file. If it is, then we return `Versions` from lock file validation (indicating that the fork markers should be dropped). Fixes #13951

charliermarsh · 2025-06-17T11:49:59Z

crates/uv/src/commands/project/lock.rs

+        // to re-use the existing fork markers.
+        if let Err((fork_markers_union, environments_union)) = lock.check_marker_coverage() {
+            warn_user!(
+                "Ignoring existing lockfile due to fork markers not covering the supported environments: `{}` vs `{}`",


Hmm, are you sure this should be a user-facing warning? I don’t think any of the other lockfile-invalidation messages are user-facing. They just go through tracing.

Oh, I didn't do that. That's what is on main:

uv/crates/uv/src/commands/project/lock.rs

Lines 1026 to 1034 in 5c1ebf9

warn_user!(

"Ignoring existing lockfile due to fork markers not covering the supported environments: `{}` vs `{}`",

fork_markers_union

.try_to_string()

.unwrap_or("true".to_string()),

environments_union

.try_to_string()

.unwrap_or("true".to_string()),

);

It looks like it was a user facing warning from the beginning: #10682

I in turn copied this to the disjoint requires-python check as well. Do you want me to make both of them traces instead?

Ah ok. Just leave it as-is then, thanks.

This MR contains the following updates: | Package | Update | Change | |---|---|---| | [astral-sh/uv](https://github.com/astral-sh/uv) | patch | `0.7.13` -> `0.7.14` | 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.7.14`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#0714) [Compare Source](astral-sh/uv@0.7.13...0.7.14) ##### Enhancements - Add XPU to `--torch-backend` ([#14172](astral-sh/uv#14172)) - Add ROCm backends to `--torch-backend` ([#14120](astral-sh/uv#14120)) - Remove preview label from `--torch-backend` ([#14119](astral-sh/uv#14119)) - Add `[tool.uv.dependency-groups].mygroup.requires-python` ([#13735](astral-sh/uv#13735)) - Add auto-detection for AMD GPUs ([#14176](astral-sh/uv#14176)) - Show retries for HTTP status code errors ([#13897](astral-sh/uv#13897)) - Support transparent Python patch version upgrades ([#13954](astral-sh/uv#13954)) - Warn on empty index directory ([#13940](astral-sh/uv#13940)) - Publish to DockerHub ([#14088](astral-sh/uv#14088)) ##### Performance - Make cold resolves about 10% faster ([#14035](astral-sh/uv#14035)) ##### Bug fixes - Don't use walrus operator in interpreter query script ([#14108](astral-sh/uv#14108)) - Fix handling of changes to `requires-python` ([#14076](astral-sh/uv#14076)) - Fix implied `platform_machine` marker for `win_amd64` platform tag ([#14041](astral-sh/uv#14041)) - Only update existing symlink directories on preview uninstall ([#14179](astral-sh/uv#14179)) - Serialize Python requests for tools as canonicalized strings ([#14109](astral-sh/uv#14109)) - Support netrc and same-origin credential propagation on index redirects ([#14126](astral-sh/uv#14126)) - Support reading `dependency-groups` from pyproject.tomls with no `[project]` ([#13742](astral-sh/uv#13742)) - Handle an existing shebang in `uv init --script` ([#14141](astral-sh/uv#14141)) - Prevent concurrent updates of the environment in `uv run` ([#14153](astral-sh/uv#14153)) - Filter managed Python distributions by platform before querying when included in request ([#13936](astral-sh/uv#13936)) ##### Documentation - Replace cuda124 with cuda128 ([#14168](astral-sh/uv#14168)) - Document the way member sources shadow workspace sources ([#14136](astral-sh/uv#14136)) - Sync documented PyTorch integration index for CUDA and ROCm versions from PyTorch website ([#14100](astral-sh/uv#14100)) </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).

This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [ghcr.io/astral-sh/uv](https://github.com/astral-sh/uv) | final | patch | `0.7.13` -> `0.7.15` | --- ### Release Notes <details> <summary>astral-sh/uv (ghcr.io/astral-sh/uv)</summary> ### [`v0.7.15`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#0715) [Compare Source](astral-sh/uv@0.7.14...0.7.15) ##### Enhancements - Consistently use `Ordering::Relaxed` for standalone atomic use cases ([#14190](astral-sh/uv#14190)) - Warn on ambiguous relative paths for `--index` ([#14152](astral-sh/uv#14152)) - Skip GitHub fast path when rate-limited ([#13033](astral-sh/uv#13033)) - Preserve newlines in `schema.json` descriptions ([#13693](astral-sh/uv#13693)) ##### Bug fixes - Add check for using minor version link when creating a venv on Windows ([#14252](astral-sh/uv#14252)) - Strip query parameters when parsing source URL ([#14224](astral-sh/uv#14224)) ##### Documentation - Add a link to PyPI FAQ to clarify what per-project token is ([#14242](astral-sh/uv#14242)) ##### Preview features - Allow symlinks in the build backend ([#14212](astral-sh/uv#14212)) ### [`v0.7.14`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#0714) [Compare Source](astral-sh/uv@0.7.13...0.7.14) ##### Enhancements - Add XPU to `--torch-backend` ([#14172](astral-sh/uv#14172)) - Add ROCm backends to `--torch-backend` ([#14120](astral-sh/uv#14120)) - Remove preview label from `--torch-backend` ([#14119](astral-sh/uv#14119)) - Add `[tool.uv.dependency-groups].mygroup.requires-python` ([#13735](astral-sh/uv#13735)) - Add auto-detection for AMD GPUs ([#14176](astral-sh/uv#14176)) - Show retries for HTTP status code errors ([#13897](astral-sh/uv#13897)) - Support transparent Python patch version upgrades ([#13954](astral-sh/uv#13954)) - Warn on empty index directory ([#13940](astral-sh/uv#13940)) - Publish to DockerHub ([#14088](astral-sh/uv#14088)) ##### Performance - Make cold resolves about 10% faster ([#14035](astral-sh/uv#14035)) ##### Bug fixes - Don't use walrus operator in interpreter query script ([#14108](astral-sh/uv#14108)) - Fix handling of changes to `requires-python` ([#14076](astral-sh/uv#14076)) - Fix implied `platform_machine` marker for `...

BurntSushi added bug Something isn't working lock Related to universal resolution and locking labels Jun 16, 2025

BurntSushi requested review from charliermarsh and konstin June 16, 2025 14:51

BurntSushi force-pushed the ag/empty-lock-file branch 2 times, most recently from ceb4a33 to fc33158 Compare June 16, 2025 16:50

BurntSushi force-pushed the ag/empty-lock-file branch from fc33158 to 91fdadb Compare June 16, 2025 17:12

konstin approved these changes Jun 17, 2025

View reviewed changes

charliermarsh reviewed Jun 17, 2025

View reviewed changes

BurntSushi merged commit 3d4f0c9 into main Jun 17, 2025
86 checks passed

BurntSushi deleted the ag/empty-lock-file branch June 17, 2025 15:50

BrewTestBot mentioned this pull request Jun 23, 2025

uv 0.7.14 Homebrew/homebrew-core#227918

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments

Fix handling of changes to `requires-python`#14076

Fix handling of changes to `requires-python`#14076
BurntSushi merged 1 commit intomainfrom
ag/empty-lock-file

BurntSushi commented Jun 16, 2025

Uh oh!

charliermarsh Jun 17, 2025

Uh oh!

BurntSushi Jun 17, 2025

Uh oh!

charliermarsh Jun 17, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

	warn_user!(
	"Ignoring existing lockfile due to fork markers not covering the supported environments: `{}` vs `{}`",
	fork_markers_union
	.try_to_string()
	.unwrap_or("true".to_string()),
	environments_union
	.try_to_string()
	.unwrap_or("true".to_string()),
	);

Comments

Conversation

BurntSushi commented Jun 16, 2025

Uh oh!

charliermarsh Jun 17, 2025

Choose a reason for hiding this comment

Uh oh!

BurntSushi Jun 17, 2025

Choose a reason for hiding this comment

Uh oh!

charliermarsh Jun 17, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants