Avoid narrowing requires-python marker with disjunctions
#10704
Merged
+172
−20
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
charliermarsh
force-pushed
the
charlie/pypy-req-python
branch
2 times, most recently
from
1b83917 to
9c22987
Compare
charliermarsh
force-pushed
the
charlie/pypy-req-python
branch
3 times, most recently
from
ef5c8f0 to
59ff621
Compare
charliermarsh
force-pushed
the
charlie/pypy-req-python
branch
from
59ff621 to
08878b0
Compare
ibraheemdev
approved these changes
Jan 17, 2025
crates/uv-resolver/src/marker.rs
Outdated
| /// `MarkerTreeKind::True` node. | ||
| fn collect_python_markers( | ||
| tree: MarkerTree, | ||
| markers: &mut Vec<Vec<Ranges<Version>>>, |
There was a problem hiding this comment.
The search here only cares about a single type of node (CanonicalMarkerValueVersion::PythonFullVersion), and importantly that node can only show up once on a given solution path in the decision diagram. I believe this means that you shouldn't need an inner Vec here, and you can default to Ranges::full() for a solution that does not have an explicit python version requirement. That should simplify this a little bit — there is no list of versions to take the intersection of for a given solution.
konstin
approved these changes
Jan 17, 2025
BurntSushi
approved these changes
Jan 17, 2025
charliermarsh
force-pushed
the
charlie/pypy-req-python
branch
from
fd49e53 to
6cbcccf
Compare
charliermarsh
force-pushed
the
charlie/pypy-req-python
branch
from
6cbcccf to
e5e8e8f
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
A bug in
requires_python(which infers the Python requirement from a marker) was leading us to break an invariant around the relationship between the marker environment and the Python requirement. This, in turn, was leading us to drop parts of the environment space when solving.Specifically, in the linked example, we generated a fork for
python_full_version < '3.10' or platform_python_implementation != 'CPython', which was later split intopython_full_version == '3.8.*'andpython_full_version == '3.9.*', losing theplatform_python_implementation != 'CPython'portion.Closes #10669.