diff --git a/Cargo.lock b/Cargo.lock index 234c8bad2..ef34d6501 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -354,12 +354,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" -[[package]] -name = "bytesize" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" - [[package]] name = "cache-key" version = "0.0.1" @@ -830,7 +824,6 @@ dependencies = [ "puffin-git", "puffin-normalize", "pypi-types", - "requirements-txt", "rustc-hash", "serde", "serde_json", @@ -2057,7 +2050,6 @@ name = "pep508_rs" version = "0.2.3" dependencies = [ "derivative", - "fs-err", "indoc", "log", "once_cell", @@ -2271,7 +2263,6 @@ dependencies = [ "anyhow", "assert_cmd", "assert_fs", - "bitflags 2.4.2", "chrono", "clap", "distribution-filename", @@ -2497,7 +2488,6 @@ name = "puffin-distribution" version = "0.0.1" dependencies = [ "anyhow", - "bytesize", "cache-key", "distribution-filename", "distribution-types", @@ -2650,7 +2640,6 @@ version = "0.0.1" dependencies = [ "anstream", "anyhow", - "bitflags 2.4.2", "cache-key", "chrono", "clap", @@ -2684,7 +2673,6 @@ dependencies = [ "puffin-traits", "puffin-warnings", "pypi-types", - "requirements-txt", "reqwest", "rustc-hash", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index c8969aa6a..4d3c7adac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,8 +17,6 @@ anstream = { version = "0.6.5" } anyhow = { version = "1.0.79" } async_http_range_reader = { git = "https://github.com/baszalmstra/async_http_range_reader", rev = "8dab2c08ac864fec1df014465264f9a7c8eae905" } async_zip = { version = "0.0.16", features = ["tokio", "deflate"] } -bitflags = { version = "2.4.1" } -bytesize = { version = "1.3.0" } cachedir = { version = "0.3.1" } camino = { version = "1.1.6", features = ["serde1"] } cargo-util = { version = "0.2.8" } diff --git a/crates/distribution-types/Cargo.toml b/crates/distribution-types/Cargo.toml index 4ae432c57..610c3d4c3 100644 --- a/crates/distribution-types/Cargo.toml +++ b/crates/distribution-types/Cargo.toml @@ -21,7 +21,6 @@ platform-tags = { path = "../platform-tags" } puffin-git = { path = "../puffin-git", features = ["vendored-openssl"] } puffin-normalize = { path = "../puffin-normalize" } pypi-types = { path = "../pypi-types" } -requirements-txt = { path = "../requirements-txt" } anyhow = { workspace = true } chrono = { workspace = true, features = ["serde"] } diff --git a/crates/pep508-rs/Cargo.toml b/crates/pep508-rs/Cargo.toml index 33bb79dbe..faef5cdca 100644 --- a/crates/pep508-rs/Cargo.toml +++ b/crates/pep508-rs/Cargo.toml @@ -21,7 +21,6 @@ pep440_rs = { path = "../pep440-rs" } puffin-normalize = { path = "../puffin-normalize" } derivative = { workspace = true } -fs-err = { workspace = true } once_cell = { workspace = true } pyo3 = { workspace = true, optional = true, features = ["abi3", "extension-module"] } pyo3-log = { workspace = true, optional = true } @@ -34,10 +33,10 @@ unicode-width = { workspace = true } url = { workspace = true, features = ["serde"] } [dev-dependencies] -indoc = "2.0.4" -log = "0.4.20" -testing_logger = "0.1.1" -serde_json = "1.0.111" +indoc = { version = "2.0.4" } +log = { version = "0.4.20" } +serde_json = { version = "1.0.111" } +testing_logger = { version = "0.1.1" } [features] pyo3 = ["dep:pyo3", "pep440_rs/pyo3", "pyo3-log"] diff --git a/crates/platform-host/src/linux.rs b/crates/platform-host/src/linux.rs index 283634548..46d438a7a 100644 --- a/crates/platform-host/src/linux.rs +++ b/crates/platform-host/src/linux.rs @@ -1,15 +1,17 @@ //! Taken from `glibc_version` (), //! which used the Apache 2.0 license (but not the MIT license) -use crate::{Os, PlatformError}; +use std::path::{Path, PathBuf}; +use std::process::{Command, Stdio}; + use fs_err as fs; use goblin::elf::Elf; use once_cell::sync::Lazy; use regex::Regex; -use std::path::{Path, PathBuf}; -use std::process::{Command, Stdio}; use tracing::trace; +use crate::{Os, PlatformError}; + // glibc version is taken from std/sys/unix/os.rs fn glibc_version_from_ldd() -> Result { trace!("Falling back to `ldd --version` to detect OS libc version"); diff --git a/crates/puffin-distribution/Cargo.toml b/crates/puffin-distribution/Cargo.toml index 71a6a84de..8c4a28f2a 100644 --- a/crates/puffin-distribution/Cargo.toml +++ b/crates/puffin-distribution/Cargo.toml @@ -30,7 +30,6 @@ puffin-traits = { path = "../puffin-traits" } pypi-types = { path = "../pypi-types" } anyhow = { workspace = true } -bytesize = { workspace = true } fs-err = { workspace = true } futures = { workspace = true } nanoid = { workspace = true } diff --git a/crates/puffin-resolver/Cargo.toml b/crates/puffin-resolver/Cargo.toml index dac3ec502..59ef78a7e 100644 --- a/crates/puffin-resolver/Cargo.toml +++ b/crates/puffin-resolver/Cargo.toml @@ -31,11 +31,9 @@ puffin-normalize = { path = "../puffin-normalize" } puffin-traits = { path = "../puffin-traits" } puffin-warnings = { path = "../puffin-warnings" } pypi-types = { path = "../pypi-types" } -requirements-txt = { path = "../requirements-txt" } anstream = { workspace = true } anyhow = { workspace = true } -bitflags = { workspace = true } chrono = { workspace = true } clap = { workspace = true, features = ["derive"], optional = true } dashmap = { workspace = true } diff --git a/crates/puffin/Cargo.toml b/crates/puffin/Cargo.toml index 1e6af229c..3e7b4fcd2 100644 --- a/crates/puffin/Cargo.toml +++ b/crates/puffin/Cargo.toml @@ -44,7 +44,6 @@ flate2 = { workspace = true, default-features = false } anstream = { workspace = true } anyhow = { workspace = true } -bitflags = { workspace = true } chrono = { workspace = true } clap = { workspace = true, features = ["derive"] } fs-err = { workspace = true, features = ["tokio"] }