Python
/
uv
mirror of https://github.com/astral-sh/uv
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix handling of `extra != ...` markers

This commit is contained in:
Zanie Blue 2025-12-10 12:46:00 -06:00
parent caac4814df
commit 73a5822101
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
crates/uv-pep508/src/marker/tree.rs
View File

@ -2531,6 +2531,42 @@ mod test {
assert_eq!(simplified, expected);
}
#[test]
fn test_simplify_extras_with_all_true() {
// Test `simplify_extras_with(|_| true)` which is used in `PubGrubPackage::from_package`.
// This simulates treating all extras as present/enabled.
// `extra == 'foo'` with all extras present should simplify to TRUE
let markers = MarkerTree::from_str(r#"extra == "foo""#).unwrap();
let simplified = markers.simplify_extras_with(|_| true);
assert_eq!(simplified, MarkerTree::TRUE);
// `extra != 'foo'` with all extras present should simplify to FALSE
// because the extra IS present, so `!= 'foo'` is false.
let markers = MarkerTree::from_str(r#"extra != "foo""#).unwrap();
let simplified = markers.simplify_extras_with(|_| true);
assert_eq!(simplified, MarkerTree::FALSE);
// `os_name == "nt" and extra != "foo"` with all extras present
// should simplify to FALSE (because `extra != "foo"` is false)
let markers = MarkerTree::from_str(r#"os_name == "nt" and extra != "foo""#).unwrap();
let simplified = markers.simplify_extras_with(|_| true);
assert_eq!(simplified, MarkerTree::FALSE);
// Compare with `without_extras` which removes extras without evaluating them:
// `extra != 'foo'` with `without_extras` should simplify to TRUE
let markers = MarkerTree::from_str(r#"extra != "foo""#).unwrap();
let simplified = markers.without_extras();
assert_eq!(simplified, MarkerTree::TRUE);
// `os_name == "nt" and extra != "foo"` with `without_extras`
// should simplify to `os_name == "nt"`
let markers = MarkerTree::from_str(r#"os_name == "nt" and extra != "foo""#).unwrap();
let simplified = markers.without_extras();
let expected = MarkerTree::from_str(r#"os_name == "nt""#).unwrap();
assert_eq!(simplified, expected);
}
#[test]
fn test_marker_simplification() {
assert_false("python_version == '3.9.1'");

2
crates/uv-resolver/src/pubgrub/package.rs
View File

@ -108,7 +108,7 @@ impl PubGrubPackage {
// extras end up having two distinct marker expressions, which in turn
// makes them two distinct packages. This results in PubGrub being
// unable to unify version constraints across such packages.
let marker = marker.simplify_extras_with(|_| true);
let marker = marker.without_extras();
if let Some(extra) = extra {
Self(Arc::new(PubGrubPackageInner::Extra {
name,