mirror of
https://github.com/astral-sh/uv.git
synced 2025-07-07 21:35:00 +00:00
563507edba
In some cases, it's possible for the marker expressions on conflicting dependency specification to be disjoint but *incomplete*. That is, if one unions the disjoint markers, the result is not the complete set of marker environments possible. There may be some "gap" of marker environments not covered by the markers. This is a problem in practice because, before this commit, we only created forks in the resolver for specific marker expressions. So if a dependency happened to fall in a "gap," our resolver would never see it. This commit fixes this by adding a new split covering the negation of the union of all marker expressions in a set of forks for a specific package. Originally, I had planned on only creating this split when it was known that the gap actually existed. That is, when the negation of the marker expressions did *not* correspond to the empty set. After a lot of thought, unfortunately, this (I believe) effectively boils down to 3SAT, which is NP-complete. Instead, what we do here is *always* create an extra split unless we can definitively tell that it is empty. We look for a few cases, but otherwise throw our hands up and potentially do wasted work. This also updates the lock scenario tests to reflect the actual bug fix here. |
||
|---|---|---|
| .. | ||
| pubgrub | ||
| resolution | ||
| resolver | ||
| snapshots | ||
| bare.rs | ||
| candidate_selector.rs | ||
| dependency_mode.rs | ||
| dependency_provider.rs | ||
| error.rs | ||
| exclude_newer.rs | ||
| exclusions.rs | ||
| flat_index.rs | ||
| fork_urls.rs | ||
| lib.rs | ||
| lock.rs | ||
| manifest.rs | ||
| marker.rs | ||
| options.rs | ||
| pins.rs | ||
| preferences.rs | ||
| prerelease_mode.rs | ||
| python_requirement.rs | ||
| redirect.rs | ||
| requires_python.rs | ||
| resolution_mode.rs | ||
| version_map.rs | ||
| yanks.rs | ||