Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Discard insufficient fork markers #10682

Merged
merged 3 commits into from
Mar 13, 2025
Merged

Conversation

konstin
Copy link
Member

@konstin konstin commented Jan 16, 2025

In #10669, a pyproject.toml with requires-python but no environment had a lockfile covering only a subset of the requires-python space:

resolution-markers = [
    "python_full_version >= '3.10' and platform_python_implementation == 'CPython'",
    "python_full_version == '3.9.*'",
    "python_full_version < '3.9'",
]

This marker set is invalid, we have to reject the lockfile. (We can still use the versions though, to avoid churn).

Part 1/2 of #10669

@konstin konstin marked this pull request as draft January 16, 2025 14:43
@konstin konstin assigned konstin and unassigned konstin Jan 16, 2025
@konstin konstin added the bug Something isn't working label Jan 16, 2025
@charliermarsh
Copy link
Member

Once discarded, do we just produce the same lockfile anyway? (If so, does this actually fix anything?)

@konstin
Copy link
Member Author

konstin commented Jan 16, 2025

That's the other half of #10669: the lockfile we're seeing is invalid, it doesn't cover all possible environments. We should never produce a lockfile in this state (fixing #10669), this new branch is error recovery from a buggy state.

This PR exists because i minimized #10669 to this problem by keeping the lockfile, while we still need to fix the problem where we produce this lockfile starting from a pyproject.toml.

@charliermarsh
Copy link
Member

Ok. My question is: does this actually produce the correct lockfile? Or even with this change, are we still producing the incorrect lockfile after invalidating?

@konstin konstin changed the base branch from main to charlie/pypy-req-python January 17, 2025 10:53
@konstin
Copy link
Member Author

konstin commented Jan 17, 2025

If checked that when running uv sync on attrs' uv-lock branch, we warn and fix the markers in the lockfile.

There are two ways to create the lockfile:

A)

git switch uv-lock
uv-this-pr sync

B)

git switch uv-lock
rm uv.lock
uv-this-pr sync

(A) has a slightly larger diff to uv-lock than (B) because we collapse e.g. zipp 3.20.2 and zip 3.21.0 into only zipp 3.20.2. I think this is acceptable for an error recovery branch.

@konstin konstin marked this pull request as ready for review January 17, 2025 11:02
@charliermarsh charliermarsh force-pushed the charlie/pypy-req-python branch from 6cbcccf to e5e8e8f Compare January 17, 2025 15:58
Base automatically changed from charlie/pypy-req-python to main January 17, 2025 16:25
@konstin konstin force-pushed the konsti/discard-invalid-fork-markers branch from c9946b6 to 09ca582 Compare January 17, 2025 18:16
@charliermarsh
Copy link
Member

I'll tweak and merge this.

@konstin konstin force-pushed the konsti/discard-invalid-fork-markers branch 3 times, most recently from 75a28a2 to 7a6e478 Compare January 21, 2025 10:22

Unverified

The email in this signature doesn’t match the committer email.
In #10669, a pyproject.toml with requires-python but no environment had a lockfile covering only a subset of the requires-python space:

```toml
resolution-markers = [
    "python_full_version >= '3.10' and platform_python_implementation == 'CPython'",
    "python_full_version == '3.9.*'",
    "python_full_version < '3.9'",
]
```

This marker set is invalid, we have to reject the lockfile. (We can still use the versions though, to avoid churn).
@konstin konstin force-pushed the konsti/discard-invalid-fork-markers branch from 7a6e478 to fe4a67b Compare March 10, 2025 22:55

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
@charliermarsh
Copy link
Member

I'm a little nervous about this change but don't really have better ideas on how to validate it.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
@konstin
Copy link
Member Author

konstin commented Mar 11, 2025

What do think about this? We check that the fork marker coverage is correct for the entire test suite.

@konstin konstin merged commit 33b70b1 into main Mar 13, 2025
75 checks passed
@konstin konstin deleted the konsti/discard-invalid-fork-markers branch March 13, 2025 14:49
tmeijn pushed a commit to tmeijn/dotfiles that referenced this pull request Mar 24, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
This MR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [astral-sh/uv](https://github.com/astral-sh/uv) | patch | `0.6.5` -> `0.6.9` |

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.6.9`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#069)

[Compare Source](astral-sh/uv@0.6.8...0.6.9)

##### Enhancements

-   Use `keyring --mode creds` when `authenticate = "always"` ([#&#8203;12316](astral-sh/uv#12316))
-   Fail with specific error message when no password is present and `authenticate = "always"` ([#&#8203;12313](astral-sh/uv#12313))

##### Bug fixes

-   Add boolish value parser for `UV_MANAGED_PYTHON` flags ([#&#8203;12345](astral-sh/uv#12345))
-   Make deserialization non-fatal when assessing source tree revisions ([#&#8203;12319](astral-sh/uv#12319))
-   Use resolver-returned wheel over alternate cached wheel ([#&#8203;12301](astral-sh/uv#12301))

##### Documentation

-   Add experimental `--torch-backend` to the PyTorch guide ([#&#8203;12317](astral-sh/uv#12317))
-   Fix `#keyring-provider` references in alternative index docs ([#&#8203;12315](astral-sh/uv#12315))
-   Fix `--directory` path in examples ([#&#8203;12165](astral-sh/uv#12165))

##### Preview changes

-   Automatically infer the PyTorch index via `--torch-backend=auto` ([#&#8203;12070](astral-sh/uv#12070))

### [`v0.6.8`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#068)

[Compare Source](astral-sh/uv@0.6.7...0.6.8)

##### Enhancements

-   Add support for enabling all groups by default with `default-groups = "all"` ([#&#8203;12289](astral-sh/uv#12289))
-   Add simpler `--managed-python` and `--no-managed-python` flags for toggling Python preferences ([#&#8203;12246](astral-sh/uv#12246))

##### Performance

-   Avoid allocations for default cache keys ([#&#8203;12063](astral-sh/uv#12063))

##### Bug fixes

-   Allow local version mismatches when validating lockfile ([#&#8203;12285](astral-sh/uv#12285))
-   Allow owned string when deserializing `requires-python` ([#&#8203;12278](astral-sh/uv#12278))
-   Make cache errors non-fatal in `Planner::build` ([#&#8203;12281](astral-sh/uv#12281))

### [`v0.6.7`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#067)

[Compare Source](astral-sh/uv@0.6.6...0.6.7)

##### Python

-   Add CPython 3.14.0a6
-   Fix regression where extension modules would use wrong `CXX` compiler on Linux
-   Enable FTS3 enhanced query syntax for SQLite

See the [`python-build-standalone` release notes](https://github.com/astral-sh/python-build-standalone/releases/tag/20250317) for more details.

##### Enhancements

-   Add support for `-c` constraints in `uv add` ([#&#8203;12209](astral-sh/uv#12209))
-   Add support for `--global` default version in `uv python pin` ([#&#8203;12115](astral-sh/uv#12115))
-   Always reinstall local source trees passed to `uv pip install` ([#&#8203;12176](astral-sh/uv#12176))
-   Render token claims on publish permission error ([#&#8203;12135](astral-sh/uv#12135))
-   Add pip-compatible `--group` flag to `uv pip install` and `uv pip compile` ([#&#8203;11686](astral-sh/uv#11686))

##### Preview features

-   Avoid creating duplicate directory entries in built wheels ([#&#8203;12206](astral-sh/uv#12206))
-   Allow overriding module names for editable builds ([#&#8203;12137](astral-sh/uv#12137))

##### Performance

-   Avoid replicating core-metadata field on `File` struct ([#&#8203;12159](astral-sh/uv#12159))

##### Bug fixes

-   Add `src` to default cache keys ([#&#8203;12062](astral-sh/uv#12062))
-   Discard insufficient fork markers ([#&#8203;10682](astral-sh/uv#10682))
-   Ensure `python pin --global` creates parent directories if missing ([#&#8203;12180](astral-sh/uv#12180))
-   Fix GraalPy abi tag parsing and discovery ([#&#8203;12154](astral-sh/uv#12154))
-   Remove extraneous script packages in `uv sync --script` ([#&#8203;12158](astral-sh/uv#12158))
-   Remove redundant `activate.bat` output ([#&#8203;12160](astral-sh/uv#12160))
-   Avoid subsequent index hint when no versions are available on the first index ([#&#8203;9332](astral-sh/uv#9332))
-   Error on lockfiles with incoherent wheel versions ([#&#8203;12235](astral-sh/uv#12235))

##### Rust API

-   Update `BaseClientBuild` to accept custom proxies ([#&#8203;12232](astral-sh/uv#12232))

##### Documentation

-   Make testpypi index explicit in example snippet ([#&#8203;12148](astral-sh/uv#12148))
-   Reverse and format the archived changelogs ([#&#8203;12099](astral-sh/uv#12099))
-   Use consistent commas around i.e. and e.g. ([#&#8203;12157](astral-sh/uv#12157))
-   Fix typos in MRE docs ([#&#8203;12198](astral-sh/uv#12198))
-   Fix double space typo ([#&#8203;12171](astral-sh/uv#12171))

### [`v0.6.6`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#066)

[Compare Source](astral-sh/uv@0.6.5...0.6.6)

##### Python

-   Add support for dynamic musl Python distributions on x86-64 Linux ([#&#8203;12121](astral-sh/uv#12121))
-   Allow the experimental JIT to be enabled at runtime on Python 3.13 and 3.14 on Linux
-   Upgrade the build toolchain to LLVM 20, improving performance

See the [`python-build-standalone` release notes](https://github.com/astral-sh/python-build-standalone/releases/tag/20250311) for more details.

##### Enhancements

-   Add `--marker` flag to `uv add` ([#&#8203;12012](astral-sh/uv#12012))
-   Allow overriding module name for uv build backend ([#&#8203;11884](astral-sh/uv#11884))
-   Sync latest Python releases ([#&#8203;12120](astral-sh/uv#12120))
-   Use 'Upload' instead of 'Download' in publish reporter ([#&#8203;12029](astral-sh/uv#12029))
-   Add `[index].authenticate` allowing authentication to be required on an index ([#&#8203;11896](astral-sh/uv#11896))
-   Add support for Windows legacy scripts in `uv tool run` ([#&#8203;12079](astral-sh/uv#12079))
-   Propagate conflicting dependency groups when using `include-group` ([#&#8203;12005](astral-sh/uv#12005))
-   Show ambiguous requirements when `uv add` failed ([#&#8203;12106](astral-sh/uv#12106))

##### Performance

-   Cache workspace discovery ([#&#8203;12096](astral-sh/uv#12096))
-   Insert dependencies into fork state prior to fetching metadata ([#&#8203;12057](astral-sh/uv#12057))
-   Remove some allocations from `uv-auth` ([#&#8203;12077](astral-sh/uv#12077))

##### Bug fixes

-   Avoid considering `PATH` updated when the `export` is commented in the shellrc ([#&#8203;12043](astral-sh/uv#12043))
-   Fix `uv publish` retry on network failures ([#&#8203;12041](astral-sh/uv#12041))
-   Use a sized stream in `uv publish` to comply with WSGI PyPI server constraints ([#&#8203;12111](astral-sh/uv#12111))
-   Fix `uv python install --reinstall` when the version was not previously installed ([#&#8203;12124](astral-sh/uv#12124))

##### Preview features

-   Fix `uv_build` invocation ([#&#8203;12058](astral-sh/uv#12058))

##### Documentation

-   Quote versions string in `python-versions.md` ([#&#8203;12112](astral-sh/uv#12112))
-   Fix tool concept page headings ([#&#8203;12053](astral-sh/uv#12053))
-   Update the `[index].authenticate` docs ([#&#8203;12102](astral-sh/uv#12102))
-   Update versioning policy ([#&#8203;11666](astral-sh/uv#11666))

</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:eyJjcmVhdGVkSW5WZXIiOiIzOS4xOTQuMCIsInVwZGF0ZWRJblZlciI6IjM5LjIwOS4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiXX0=-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants