diff --git a/crates/puffin-cli/Cargo.toml b/crates/puffin-cli/Cargo.toml index 9d00cf125..e23b4178d 100644 --- a/crates/puffin-cli/Cargo.toml +++ b/crates/puffin-cli/Cargo.toml @@ -6,10 +6,10 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -puffin-requirements = { path = "../puffin-requirements" } puffin-client = { path = "../puffin-client" } +puffin-requirements = { path = "../puffin-requirements" } -anyhow = "1.0.75" +anyhow = { version = "1.0.75" } clap = { version = "4.4.6", features = ["derive"] } colored = { version = "2.0.4" } memchr = { version = "2.6.4" } @@ -18,10 +18,9 @@ async-std = { version = "1.12.0", features = [ "tokio1", "unstable", ] } -futures = "0.3.28" -pep508_rs = "0.2.3" -pep440_rs = "0.3.12" -tracing = "0.1.37" -tracing-tree = "0.2.5" +futures = { version = "0.3.28" } +pep508_rs = { version = "0.2.3" } +pep440_rs = { version = "0.3.12" } +tracing = { version = "0.1.37" } +tracing-tree = { version = "0.2.5" } tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } -indicatif = "0.17.7" diff --git a/crates/puffin-cli/src/commands/install.rs b/crates/puffin-cli/src/commands/install.rs index 14cdbbfb8..619c40e26 100644 --- a/crates/puffin-cli/src/commands/install.rs +++ b/crates/puffin-cli/src/commands/install.rs @@ -13,7 +13,7 @@ use puffin_client::{File, PypiClientBuilder, SimpleJson}; use puffin_requirements::metadata::Metadata21; use puffin_requirements::package_name::PackageName; use puffin_requirements::wheel::WheelName; -use indicatif::{ProgressBar, ProgressStyle}; + use crate::commands::ExitStatus; #[derive(Debug)] @@ -86,10 +86,6 @@ pub(crate) async fn install(src: &Path) -> Result { // Resolve the requirements. let mut resolution: HashMap = HashMap::with_capacity(requirements.len()); - let spinner_style = ProgressStyle::with_template("{spinner} {wide_bar} [{pos}/{len}] {msg}").unwrap(); - let bar = ProgressBar::new(8); - bar.set_style(spinner_style); - while let Some(chunk) = package_stream.next().await { for result in chunk { let result: Response = result?; @@ -131,7 +127,6 @@ pub(crate) async fn install(src: &Path) -> Result { let normalized_name = PackageName::normalize(&requirement.name); in_flight.remove(&normalized_name); resolution.insert(normalized_name, metadata.version); - bar.inc(1); // Enqueue its dependencies. for dependency in metadata.requires_dist { diff --git a/crates/puffin-client/Cargo.toml b/crates/puffin-client/Cargo.toml index 1c6cc28b6..b1d212748 100644 --- a/crates/puffin-client/Cargo.toml +++ b/crates/puffin-client/Cargo.toml @@ -16,5 +16,5 @@ serde = { version = "1.0.188" } serde_json = { version = "1.0.107" } thiserror = { version = "1.0.49" } url = { version = "2.4.1" } -tracing = "0.1.37" -indicatif = "0.17.7" +tracing = { version = "0.1.37" } +