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
22 changes: 11 additions & 11 deletions crates/uv-installer/src/site_packages.rs
Original file line number Diff line number Diff line change
Expand Up @@ -287,17 +287,17 @@ impl SitePackages {
constraints: &[NameRequirementSpecification],
markers: &ResolverMarkerEnvironment,
) -> Result<SatisfiesResult> {
// Collect the constraints.
let constraints: FxHashMap<&PackageName, Vec<&Requirement>> =
constraints
.iter()
.fold(FxHashMap::default(), |mut constraints, constraint| {
constraints
.entry(&constraint.requirement.name)
.or_default()
.push(&constraint.requirement);
constraints
});
// Collect the constraints, filtering them by their marker environment.
let constraints: FxHashMap<&PackageName, Vec<&Requirement>> = constraints
.iter()
.filter(|constraint| constraint.requirement.evaluate_markers(Some(markers), &[]))
.fold(FxHashMap::default(), |mut constraints, constraint| {
constraints
.entry(&constraint.requirement.name)
.or_default()
.push(&constraint.requirement);
constraints
});

let mut stack = Vec::with_capacity(requirements.len());
let mut seen = FxHashSet::with_capacity_and_hasher(requirements.len(), FxBuildHasher);
Expand Down
50 changes: 50 additions & 0 deletions crates/uv/tests/it/pip_install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3288,6 +3288,56 @@ fn install_constraints_respects_offline_mode() {
);
}

/// Test that constraint markers are respected when validating the current environment (i.e., we
/// skip resolution entirely).
#[test]
fn install_constraints_with_markers() -> Result<()> {
let context = TestContext::new("3.12");
let requirements_txt = context.temp_dir.child("requirements.txt");
requirements_txt.write_str("pytest")?;

// Create a constraints file with a marker that is not relevant to the current environment.
let constraints_txt = context.temp_dir.child("constraints.txt");
constraints_txt.write_str("pytest==8.0.0; sys_platform == 'nonexistent-platform'")?;

uv_snapshot!(context.pip_install()
.arg("-r")
.arg("requirements.txt")
.arg("--constraint")
.arg("constraints.txt"), @r###"
success: true
exit_code: 0
----- stdout -----

----- stderr -----
Resolved 4 packages in [TIME]
Prepared 4 packages in [TIME]
Installed 4 packages in [TIME]
+ iniconfig==2.0.0
+ packaging==24.0
+ pluggy==1.4.0
+ pytest==8.1.1
"###
);

// We should only see "Audited" here; no need to resolve.
uv_snapshot!(context.pip_install()
.arg("-r")
.arg("requirements.txt")
.arg("--constraint")
.arg("constraints.txt"), @r###"
success: true
exit_code: 0
----- stdout -----

----- stderr -----
Audited 1 package in [TIME]
"###
);

Ok(())
}

/// Tests that we can install `polars==0.14.0`, which has this odd dependency
/// requirement in its wheel metadata: `pyarrow>=4.0.*; extra == 'pyarrow'`.
///
Expand Down
Loading