Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add priorities for editables #3133

Merged
merged 1 commit into from
Apr 19, 2024
Merged

Add priorities for editables #3133

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 16 additions & 9 deletions crates/uv-resolver/src/resolver/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,10 +831,17 @@ impl<

// Add a dependency on each editable.
for (editable, metadata) in self.editables.iter() {
constraints.push(
PubGrubPackage::from_package(metadata.name.clone(), None, &self.urls),
Range::singleton(metadata.version.clone()),
);
let package =
PubGrubPackage::from_package(metadata.name.clone(), None, &self.urls);
let version = Range::singleton(metadata.version.clone());

// Update the package priorities.
priorities.insert(&package, &version);

// Add the editable as a direct dependency.
constraints.push(package, version);

// Add a dependency on each extra.
for extra in &editable.extras {
constraints.push(
PubGrubPackage::from_package(
Expand Down Expand Up @@ -891,7 +898,7 @@ impl<
)?;

for (dep_package, dep_version) in constraints.iter() {
debug!("Adding transitive dependency for {package}{version}: {dep_package}{dep_version}");
debug!("Adding transitive dependency for {package}=={version}: {dep_package}{dep_version}");

// Update the package priorities.
priorities.insert(dep_package, dep_version);
Expand Down Expand Up @@ -999,14 +1006,14 @@ impl<
self.markers,
)?;

for (package, version) in constraints.iter() {
debug!("Adding transitive dependency: {package}{version}");
for (dep_package, dep_version) in constraints.iter() {
debug!("Adding transitive dependency for {package}=={version}: {dep_package}{dep_version}");

// Update the package priorities.
priorities.insert(package, version);
priorities.insert(dep_package, dep_version);

// Emit a request to fetch the metadata for this package.
self.visit_package(package, request_sink).await?;
self.visit_package(dep_package, request_sink).await?;
}

Ok(Dependencies::Available(constraints.into()))
Expand Down
Loading