mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-09-30 14:01:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use logger interface for remaining audit messages (#6586)

Browse source
This commit is contained in:
Charlie Marsh 2024-08-24 12:46:41 -04:00 • committed by GitHub
parent 1fc45db082
commit 31019ff140
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/uv/src/commands/pip/install.rs
View file

@ -30,10 +30,10 @@ use uv_resolver::{
}; };
use uv_types::{BuildIsolation, HashStrategy}; use uv_types::{BuildIsolation, HashStrategy};
use crate::commands::pip::loggers::{DefaultInstallLogger, DefaultResolveLogger}; use crate::commands::pip::loggers::{DefaultInstallLogger, DefaultResolveLogger, InstallLogger};
use crate::commands::pip::operations::Modifications; use crate::commands::pip::operations::Modifications;
use crate::commands::pip::{operations, resolution_environment}; use crate::commands::pip::{operations, resolution_environment};
use crate::commands::{elapsed, ExitStatus, SharedState}; use crate::commands::{ExitStatus, SharedState};
use crate::printer::Printer; use crate::printer::Printer;
/// Install packages into the current environment. /// Install packages into the current environment.
@ -204,18 +204,7 @@ pub(crate) async fn pip_install(
debug!("Requirement satisfied: {requirement}"); debug!("Requirement satisfied: {requirement}");
} }
} }
let num_requirements = requirements.len(); DefaultInstallLogger.on_audit(requirements.len(), start, printer)?;
let s = if num_requirements == 1 { "" } else { "s" };
writeln!(
printer.stderr(),
"{}",
format!(
"Audited {} {}",
format!("{num_requirements} package{s}").bold(),
format!("in {}", elapsed(start.elapsed())).dimmed()
)
.dimmed()
)?;
if dry_run { if dry_run {
writeln!(printer.stderr(), "Would make no changes")?; writeln!(printer.stderr(), "Would make no changes")?;
} }

16
crates/uv/src/commands/pip/operations.rs
View file

@ -40,9 +40,9 @@ use uv_resolver::{
use uv_types::{HashStrategy, InFlight, InstalledPackagesProvider}; use uv_types::{HashStrategy, InFlight, InstalledPackagesProvider};
use uv_warnings::warn_user; use uv_warnings::warn_user;
use crate::commands::pip::loggers::{InstallLogger, ResolveLogger}; use crate::commands::pip::loggers::{DefaultInstallLogger, InstallLogger, ResolveLogger};
use crate::commands::reporters::{InstallReporter, PrepareReporter, ResolverReporter}; use crate::commands::reporters::{InstallReporter, PrepareReporter, ResolverReporter};
use crate::commands::{compile_bytecode, elapsed, ChangeEventKind, DryRunEvent}; use crate::commands::{compile_bytecode, ChangeEventKind, DryRunEvent};
use crate::printer::Printer; use crate::printer::Printer;
/// Consolidate the requirements for an installation. /// Consolidate the requirements for an installation.
@ -524,17 +524,7 @@ fn report_dry_run(
// Nothing to do. // Nothing to do.
if remote.is_empty() && cached.is_empty() && reinstalls.is_empty() && extraneous.is_empty() { if remote.is_empty() && cached.is_empty() && reinstalls.is_empty() && extraneous.is_empty() {
let s = if resolution.len() == 1 { "" } else { "s" }; DefaultInstallLogger.on_audit(resolution.len(), start, printer)?;
writeln!(
printer.stderr(),
"{}",
format!(
"Audited {} {}",
format!("{} package{}", resolution.len(), s).bold(),
format!("in {}", elapsed(start.elapsed())).dimmed()
)
.dimmed()
)?;
writeln!(printer.stderr(), "Would make no changes")?; writeln!(printer.stderr(), "Would make no changes")?;
return Ok(()); return Ok(());
} }