Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 27 additions & 29 deletions crates/uv-distribution/src/metadata/requires_dist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -389,19 +389,17 @@ impl FlatRequiresDist {
.simplify_extras(slice::from_ref(&extra))
.simplify_not_extras_with(|candidate| candidate != &extra)
.and(production_marker.negate());
if extra_marker.is_false() {
let marker = marker.and(extra_marker);
if marker.is_false() {
continue;
}
let requirement = {
let marker = marker.and(extra_marker);
Requirement {
name: requirement.name.clone(),
extras: requirement.extras.clone(),
groups: requirement.groups.clone(),
source: requirement.source.clone(),
origin: requirement.origin.clone(),
marker,
}
let requirement = Requirement {
name: requirement.name.clone(),
extras: requirement.extras.clone(),
groups: requirement.groups.clone(),
source: requirement.source.clone(),
origin: requirement.origin.clone(),
marker,
};
if requirement.name == *name {
// Add each transitively included extra.
Expand All @@ -412,34 +410,34 @@ impl FlatRequiresDist {
.cloned()
.map(|extra| (extra, requirement.marker)),
);
} else {
// Add the requirements for that extra.
flattened.push(requirement);
}

// Retain the requirement, including any recursively reached self-constraint.
flattened.push(requirement);
}
}

// Drop all the self-references now that we've flattened them out.
flattened.retain(|req| req.name != *name);

// Retain any self-constraints for that extra, e.g., if `project[foo]` includes
// `project[bar]>1.0`, as a dependency, we need to propagate `project>1.0`, in addition to
// transitively expanding `project[bar]`.
for req in &requirements {
if req.name == *name {
if !req.source.is_empty() {
flattened.push(Requirement {
name: req.name.clone(),
extras: Box::new([]),
groups: req.groups.clone(),
source: req.source.clone(),
origin: req.origin.clone(),
marker: req.marker,
});
}
let mut self_constraints = vec![];
for req in &flattened {
if req.name == *name && !req.source.is_empty() {
self_constraints.push(Requirement {
name: req.name.clone(),
extras: Box::new([]),
groups: req.groups.clone(),
source: req.source.clone(),
origin: req.origin.clone(),
marker: req.marker,
});
}
}

// Drop all the self-references now that we've flattened them out.
flattened.retain(|req| req.name != *name);
flattened.extend(self_constraints);

Self(flattened.into_boxed_slice())
}
}
Expand Down
19 changes: 15 additions & 4 deletions crates/uv-resolver/src/resolver/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2205,6 +2205,17 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
}
}
};
// Filter out unreachable unsatisfiable requirements before they reach the
// unsatisfiability check.
let applicable_marker = requirement
.marker
.simplify_extras(slice::from_ref(&extra))
.simplify_not_extras_with(|candidate| candidate != &extra);
if python_marker.is_disjoint(applicable_marker)
|| !env.included_by_marker(applicable_marker)
{
continue;
}
if name == Some(&requirement.name) {
// Add each transitively included extra.
queue.extend(
Expand All @@ -2214,10 +2225,10 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
.cloned()
.map(|extra| (extra, requirement.marker)),
);
} else {
// Add the requirements for that extra.
requirements.push(Cow::Owned(requirement));
}

// Retain the requirement, including any recursively reached self-constraint.
requirements.push(Cow::Owned(requirement));
}
}

Expand All @@ -2226,7 +2237,7 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
// transitively expanding `project[bar]`.
let mut self_constraints = vec![];
for req in &requirements {
if name == Some(&req.name) && !req.source.is_empty() {
if name == Some(&req.name) && !req.extras.is_empty() && !req.source.is_empty() {
self_constraints.push(Requirement {
name: req.name.clone(),
extras: Box::new([]),
Expand Down
92 changes: 92 additions & 0 deletions crates/uv/tests/pip_compile/pip_compile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10847,6 +10847,98 @@ dev = [
Ok(())
}

/// Preserve self-constraints reached through recursive extras.
#[cfg(feature = "test-universal")]
#[test]
fn compile_pyproject_toml_recursive_extra_self_constraint() -> Result<()> {
let context = uv_test::test_context!("3.12");
let pyproject_toml = context.temp_dir.child("pyproject.toml");
pyproject_toml.write_str(indoc! {r#"
[project]
name = "recursive-demo"
version = "1.0.0"
dependencies = [
"recursive-demo[inner]>=2; sys_platform == 'win32' or extra == 'middle'",
]

[project.optional-dependencies]
inner = []
middle = []
outer = ["recursive-demo[middle]; sys_platform == 'darwin'"]
"#})?;
context
.temp_dir
.child("constraints.txt")
.write_str("recursive-demo==1.0.0")?;
context
.temp_dir
.child("requirements.in")
.write_str(".[outer]")?;

// Compiling a source tree flattens its recursive requirements before resolution.
uv_snapshot!(context.filters(), context.pip_compile()
.arg("pyproject.toml")
.arg("--extra")
.arg("outer")
.arg("--constraint")
.arg("constraints.txt")
.arg("--python-platform")
.arg("aarch64-apple-darwin")
.arg("--no-index")
.arg("--no-build"), @"
exit_code: 1 (failure)
----- stderr -----
× No solution found when resolving dependencies:
╰─▶ Because recursive-demo depends on recursive-demo{sys_platform == 'darwin'}>=2 and recursive-demo{sys_platform == 'darwin'}==1.0.0, we can conclude that your requirements are unsatisfiable.
");

// Resolving the package itself expands recursive extras inside the resolver instead.
uv_snapshot!(context.filters(), context.pip_compile()
.arg("requirements.in")
.arg("--python-platform")
.arg("aarch64-apple-darwin")
.arg("--no-index")
.arg("--no-build"), @"
exit_code: 1 (failure)
----- stderr -----
× No solution found when resolving dependencies:
╰─▶ Because only recursive-demo[outer]==1.0.0 is available and recursive-demo[outer]==1.0.0 depends on recursive-demo{sys_platform == 'darwin'}>=2, we can conclude that all versions of recursive-demo[outer] cannot be used.
And because you require recursive-demo[outer], we can conclude that your requirements are unsatisfiable.
");

// Both recursive edges intersect Python >=3.12, but their conjunction only applies below
// Python 3.11. The unreachable empty version range must not make resolution fail.
pyproject_toml.write_str(indoc! {r#"
[project]
name = "recursive-demo"
version = "1.0.0"
requires-python = ">=3.12"

[project.optional-dependencies]
inner = []
middle = ["recursive-demo[inner]>=2,<2; python_version < '3.13'"]
outer = ["recursive-demo[middle]; python_version < '3.11' or python_version >= '3.13'"]
"#})?;

uv_snapshot!(context.filters(), context.pip_compile()
.arg("requirements.in")
.arg("--universal")
.arg("--no-index")
.arg("--no-build"), @"
exit_code: 0 (success)
----- stdout -----
# This file was autogenerated by uv via the following command:
# uv pip compile --cache-dir [CACHE_DIR] requirements.in --universal --no-index --no-build
.
# via -r requirements.in

----- stderr -----
Resolved 1 package in [TIME]
");

Ok(())
}

/// Resolve from a `pyproject.toml` file with multiple recursive extras.
#[cfg(feature = "test-universal")]
#[test]
Expand Down