Skip to content

Canonicalize effective lockfile dependency markers - #1735

Draft
zaniebot wants to merge 2 commits into
zb/future-20260912-resolver-25from
zb/future-20260912-resolver-26
Draft

Canonicalize effective lockfile dependency markers#1735
zaniebot wants to merge 2 commits into
zb/future-20260912-resolver-25from
zb/future-20260912-resolver-26

Conversation

@zaniebot

Copy link
Copy Markdown
Collaborator

A fresh uv.lock can fail uv lock --check --refresh when reusing its forks drops an edge that was unreachable from its parent. MarkerTree::restrict only fixes values within the assumed parent marker, so equivalent effective edges can otherwise be written differently. Intersect each edge with the parent's PEP 508 reachability before simplifying it. This gives those edges a stable representation without changing the resolved dependency coverage or discarding conflict predicates needed by older lockfile readers.

@astral-automations-bot astral-automations-bot Bot added area:lock Related to universal resolution and locking bug Something isn't working labels Sep 12, 2026
@codspeed-hq

codspeed-hq Bot commented Sep 13, 2026

Copy link
Copy Markdown

Merging this PR will not alter performance

✅ 25 untouched benchmarks


Comparing zb/future-20260912-resolver-26 (9f9e23a) with zb/future-20260912-resolver-25 (9d9533c)

Open in CodSpeed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:lock Related to universal resolution and locking bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant