mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-08-03 18:38:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Move unreachable wheels check (#6957)

Browse source 
Prep for fixing #6512. No functional changes.
This commit is contained in:
konsti 2024-09-03 09:48:54 +02:00 • committed by GitHub
parent ccdf2d793b
commit 9e34c42cec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 41 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

75
crates/uv-resolver/src/lock/mod.rs
View file

@ -82,36 +82,41 @@ pub struct Lock {
impl Lock {
/// Initialize a [`Lock`] from a [`ResolutionGraph`].
pub fn from_resolution_graph(graph: &ResolutionGraph, root: &Path) -> Result<Self, LockError> {
let mut locked_dists = BTreeMap::new();
let mut packages = BTreeMap::new();
let requires_python = graph.requires_python.clone();
// Lock all base packages.
for node_index in graph.petgraph.node_indices() {
let ResolutionGraphNode::Dist(dist) = &graph.petgraph[node_index] else {
continue;
};
if dist.is_base() {
let fork_markers = graph
.fork_markers(dist.name(), &dist.version, dist.dist.version_or_url().url())
.cloned()
.unwrap_or_default();
let mut locked_dist = Package::from_annotated_dist(dist, fork_markers, root)?;
if !dist.is_base() {
continue;
}
let fork_markers = graph
.fork_markers(dist.name(), &dist.version, dist.dist.version_or_url().url())
.cloned()
.unwrap_or_default();
let mut package = Package::from_annotated_dist(dist, fork_markers, root)?;
// Add all dependencies
for edge in graph.petgraph.edges(node_index) {
let ResolutionGraphNode::Dist(dependency_dist) = &graph.petgraph[edge.target()]
else {
continue;
};
let marker = edge.weight().clone();
locked_dist.add_dependency(dependency_dist, marker, root)?;
}
let id = locked_dist.id.clone();
if let Some(locked_dist) = locked_dists.insert(id, locked_dist) {
return Err(LockErrorKind::DuplicatePackage {
id: locked_dist.id.clone(),
}
.into());
Self::remove_unreachable_wheels(&requires_python, &mut package);
// Add all dependencies
for edge in graph.petgraph.edges(node_index) {
let ResolutionGraphNode::Dist(dependency_dist) = &graph.petgraph[edge.target()]
else {
continue;
};
let marker = edge.weight().clone();
package.add_dependency(dependency_dist, marker, root)?;
}
let id = package.id.clone();
if let Some(locked_dist) = packages.insert(id, package) {
return Err(LockErrorKind::DuplicatePackage {
id: locked_dist.id.clone(),
}
.into());
}
}
@ -122,7 +127,7 @@ impl Lock {
};
if let Some(extra) = dist.extra.as_ref() {
let id = PackageId::from_annotated_dist(dist, root)?;
let Some(locked_dist) = locked_dists.get_mut(&id) else {
let Some(package) = packages.get_mut(&id) else {
return Err(LockErrorKind::MissingExtraBase {
id,
extra: extra.clone(),
@ -135,7 +140,7 @@ impl Lock {
continue;
};
let marker = edge.weight().clone();
locked_dist.add_optional_dependency(
package.add_optional_dependency(
extra.clone(),
dependency_dist,
marker,
@ -145,7 +150,7 @@ impl Lock {
}
if let Some(group) = dist.dev.as_ref() {
let id = PackageId::from_annotated_dist(dist, root)?;
let Some(locked_dist) = locked_dists.get_mut(&id) else {
let Some(package) = packages.get_mut(&id) else {
return Err(LockErrorKind::MissingDevBase {
id,
group: group.clone(),
@ -158,13 +163,12 @@ impl Lock {
continue;
};
let marker = edge.weight().clone();
locked_dist.add_dev_dependency(group.clone(), dependency_dist, marker, root)?;
package.add_dev_dependency(group.clone(), dependency_dist, marker, root)?;
}
}
}
let packages = locked_dists.into_values().collect();
let requires_python = graph.requires_python.clone();
let packages = packages.into_values().collect();
let options = ResolverOptions {
resolution_mode: graph.options.resolution_mode,
prerelease_mode: graph.options.prerelease_mode,
@ -182,6 +186,15 @@ impl Lock {
Ok(lock)
}
/// Remove wheels that can't be selected for installation due to environment markers.
fn remove_unreachable_wheels(requires_python: &RequiresPython, package: &mut Package) {
// Remove wheels that don't match `requires-python` and can't be selected for
// installation.
package
.wheels
.retain(|wheel| requires_python.matches_wheel_tag(&wheel.filename));
}
/// Initialize a [`Lock`] from a list of [`Package`] entries.
fn new(
version: u32,
@ -238,12 +251,6 @@ impl Lock {
}
}
}
// Remove wheels that don't match `requires-python` and can't be selected for
// installation.
package
.wheels
.retain(|wheel| requires_python.matches_wheel_tag(&wheel.filename));
}
packages.sort_by(|dist1, dist2| dist1.id.cmp(&dist2.id));