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.

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

Avoid attempting to build editables when fetching metadata #3563

Merged
merged 1 commit into from
May 14, 2024
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
5 changes: 5 additions & 0 deletions crates/uv-resolver/src/editables.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ impl Editables {
self.0.get(name)
}

/// Returns `true` if the given package is editable.
pub(crate) fn contains(&self, name: &PackageName) -> bool {
self.0.contains_key(name)
}

/// Iterate over all editables.
pub(crate) fn iter(&self) -> impl Iterator<Item = &(LocalEditable, Metadata23, Requirements)> {
self.0.values()
Expand Down
7 changes: 6 additions & 1 deletion crates/uv-resolver/src/resolver/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -616,6 +616,11 @@ impl<'a, Provider: ResolverProvider, InstalledPackages: InstalledPackagesProvide
return Err(ResolveError::UnhashedPackage(name.clone()));
}

// If the package is an editable, we don't need to fetch metadata.
if self.editables.contains(name) {
return Ok(());
}

// Emit a request to fetch the metadata for this distribution.
let dist = Dist::from_url(name.clone(), url.clone())?;
if self.index.distributions.register(dist.version_id()) {
Expand Down Expand Up @@ -956,7 +961,7 @@ impl<'a, Provider: ResolverProvider, InstalledPackages: InstalledPackagesProvide
if self.dependency_mode.is_direct() {
// If an extra is provided, wait for the metadata to be available, since it's
// still required for reporting diagnostics.
if extra.is_some() && self.editables.get(package_name).is_none() {
if extra.is_some() && !self.editables.contains(package_name) {
// Determine the distribution to lookup.
let dist = match url {
Some(url) => PubGrubDistribution::from_url(package_name, url),
Expand Down
10 changes: 6 additions & 4 deletions crates/uv/tests/pip_install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1704,14 +1704,16 @@ fn only_binary_dependent_editables() {
.arg(root_path.join("first_editable"))
.arg("-e")
.arg(root_path.join("second_editable")), @r###"
success: false
exit_code: 2
success: true
exit_code: 0
----- stdout -----
----- stderr -----
Built 2 editables in [TIME]
error: Failed to build `first-editable @ file://[WORKSPACE]/scripts/packages/dependent_editables/first_editable`
Caused by: Building source distributions is disabled
Resolved 2 packages in [TIME]
Installed 2 packages in [TIME]
+ first-editable==0.0.1 (from file://[WORKSPACE]/scripts/packages/dependent_editables/first_editable)
+ second-editable==0.0.1 (from file://[WORKSPACE]/scripts/packages/dependent_editables/second_editable)
"###
);
}
Expand Down
Loading