Reuse reporting operation in venv (#3755)

This commit is contained in:
Charlie Marsh 2024-05-22 15:43:20 -04:00 committed by GitHub
parent 3a75b50d5b
commit 0efc5d0cab
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 37 additions and 42 deletions

View file

@ -12,7 +12,7 @@ use itertools::Itertools;
use rustc_hash::FxHashMap;
use tracing::{debug, instrument};
use distribution_types::{IndexLocations, Name, Requirement, Resolution, SourceDist};
use distribution_types::{CachedDist, IndexLocations, Name, Requirement, Resolution, SourceDist};
use uv_build::{SourceBuild, SourceBuildContext};
use uv_cache::Cache;
use uv_client::RegistryClient;
@ -176,7 +176,7 @@ impl<'a> BuildContext for BuildDispatch<'a> {
&'data self,
resolution: &'data Resolution,
venv: &'data PythonEnvironment,
) -> Result<()> {
) -> Result<Vec<CachedDist>> {
debug!(
"Installing in {} in {}",
resolution
@ -213,7 +213,7 @@ impl<'a> BuildContext for BuildDispatch<'a> {
// Nothing to do.
if remote.is_empty() && cached.is_empty() && reinstalls.is_empty() {
debug!("No build requirements to install for build");
return Ok(());
return Ok(vec![]);
}
// Resolve any registry-based requirements.
@ -282,7 +282,7 @@ impl<'a> BuildContext for BuildDispatch<'a> {
.context("Failed to install build dependencies")?;
}
Ok(())
Ok(wheels)
}
#[instrument(skip_all, fields(version_id = version_id, subdirectory = ?subdirectory))]