Skip to content

Commit

Permalink
chore: move all dependencies to workspace (#501)
Browse files Browse the repository at this point in the history
  • Loading branch information
baszalmstra authored Feb 1, 2024
1 parent f29e1ba commit c7e0cb0
Show file tree
Hide file tree
Showing 17 changed files with 413 additions and 288 deletions.
129 changes: 127 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,130 @@ tag-prefix = ""
[profile.bench]
lto = true

[patch.crates-io]
#resolvo = { git = "https://github.com/mamba-org/resolvo.git", branch = "main" }
[workspace.dependencies]
anyhow = "1.0.75"
async-compression = { version = "0.4.3", features = ["gzip", "tokio", "bzip2", "zstd"] }
async-trait = "0.1.77"
base64 = "0.21.7"
bindgen = "0.66.1"
bisection = "0.1.0"
blake2 = "0.10.6"
bytes = "1.5.0"
bzip2 = "0.4.4"
cache_control = "0.2.0"
cfg-if = "1.0"
chrono = { version = "0.4.31", default-features = false, features = ["std", "serde", "alloc"] }
clap = { version = "4.4.6", features = ["derive"] }
console = { version = "0.15.7", features = ["windows-console-colors"] }
difference = "2.0.0"
digest = "0.10.7"
dirs = "5.0.1"
drop_bomb = "0.1.5"
enum_dispatch = "0.3.12"
fs-err = "2.11.0"
fslock = "0.2.1"
futures = "0.3.28"
futures-util = "0.3.28"
fxhash = "0.2.1"
getrandom = { version = "0.2.10", default-features = false }
glob = "0.3.1"
hex = "0.4.3"
http-content-range = "0.1.2"
humansize = "2.1.3"
humantime = "2.1.0"
indexmap = "2.1.0"
indicatif = "0.17.7"
itertools = "0.12.0"
json-patch = "1.1.0"
keyring = "2.0.5"
lazy-regex = "3.0.2"
lazy_static = "1.4.0"
libc = { version = "0.2" }
libloading = "0.8.1"
libz-sys = { version = "1.1.12", default-features = false }
md-5 = "0.10.6"
memchr = "2.6.4"
memmap2 = "0.9.0"
netrc-rs = "0.1.2"
nom = "7.1.3"
num_cpus = "1.16.0"
once_cell = "1.18.0"
ouroboros = "0.17.2"
pep440_rs = { version = "0.3.12" }
pep508_rs = { version = "0.2.3" }
pin-project-lite = "0.2.13"
plist = "1"
purl = { version = "0.1.2", features = ["serde"] }
quote = "1.0.33"
rattler = { version = "0.16.2", path = "crates/rattler", default-features = false }
rattler_conda_types = { version = "0.16.2", path = "crates/rattler_conda_types", default-features = false }
rattler_digest = { version = "0.16.2", path = "crates/rattler_digest", default-features = false }
rattler_libsolv_c = { version = "0.16.2", path = "crates/rattler_libsolv_c", default-features = false }
rattler_macros = { version = "0.16.2", path = "crates/rattler_macros", default-features = false }
rattler_networking = { version = "0.16.2", path = "crates/rattler_networking", default-features = false }
rattler_package_streaming = { version = "0.16.2", path = "crates/rattler_package_streaming", default-features = false }
rattler_repodata_gateway = { version = "0.16.2", path = "crates/rattler_repodata_gateway", default-features = false }
rattler_solve = { version = "0.16.2", path = "crates/rattler_solve", default-features = false }
rattler_virtual_packages = { version = "0.16.2", path = "crates/rattler_virtual_packages", default-features = false }
reflink-copy = "0.1.14"
regex = "1.9.6"
reqwest = { version = "0.11.22", default-features = false }
reqwest-middleware = "0.2.4"
resolvo = { version = "0.3.0" }
retry-policies = { version = "0.2.0", default-features = false }
serde = { version = "1.0.188" }
serde-json-python-formatter = "0.1.0"
serde_json = { version = "1.0.107" }
serde_repr = "0.1"
serde_with = "3.3.0"
serde_yaml = "0.9.25"
sha2 = "0.10.8"
shlex = "1.3.0"
smallvec = { version = "1.11.1", features = ["serde", "const_new", "const_generics", "union"] }
strum = { version = "0.25.0", features = ["derive"] }
superslice = "1.0.0"
syn = "2.0.37"
sysinfo = "0.29.10"
tar = "0.4.40"
task-local-extensions = "0.1.4"
tempdir = "0.3.7"
tempfile = "3.8.0"
thiserror = "1.0"
tokio = { version = "1.33.0", default-features = false }
tokio-stream = "0.1.14"
tokio-util = "0.7.9"
tracing = "0.1.40"
tracing-subscriber = { version = "0.3.17", default-features = false }
url = { version = "2.4.1" }
uuid = { version = "1.4.1", default-features = false }
walkdir = "2.4.0"
windows-sys = { version = "0.48.0", default-features = false }
zip = { version = "0.6.6", default-features = false }
zstd = { version = "0.12.4", default-features = false }

axum = { version = "0.6.20", default-features = false }
tower-http = { version = "0.4.4", default-features = false }
async_zip = { version = "0.0.15", default-features = false }
assert_matches = "1.5.0"
rstest = { version = "0.18.2" }

rand = "0.8.5"
tracing-test = { version = "0.2.4" }
insta = { version = "1.33.0" }
rattler_lock = { version = "0.16.2", path = "crates/rattler_lock" }
tower = { version = "0.4.13", default-features = false }

hex-literal = "0.4.1"
criterion = "0.5"
pathdiff = "0.2.1"
dunce = "1.0.4"

cmake = "0.1.50"

similar-asserts = "1.5.0"

trybuild = { version = "1.0.85" }

rstest_reuse = "0.6.0"

test-log = "0.2.12"
4 changes: 2 additions & 2 deletions crates/async_http_range_reader/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "async_http_range_reader"
authors = ["Bas Zalmstra <zalmstra.bas@gmail.com>"]
version = "0.4.0"
version = "0.5.0"
edition = "2021"
description = "A library for streaming reading of files over HTTP using range requests"
license = "BSD-3"
Expand All @@ -10,7 +10,7 @@ repository = "https://github.com/mamba-org/rattler"
[dependencies]
futures = "0.3.28"
http-content-range = "0.1.2"
itertools = "0.11.0"
itertools = "0.12.0"
bisection = "0.1.0"
memmap2 = "0.9.0"
reqwest = { version = "0.11.22", default-features = false, features = ["stream"] }
Expand Down
36 changes: 18 additions & 18 deletions crates/rattler-bin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,24 @@ native-tls = ["reqwest/native-tls", "rattler/native-tls", "rattler_repodata_gate
rustls-tls = ["reqwest/rustls-tls", "rattler/rustls-tls", "rattler_repodata_gateway/rustls-tls", "rattler_networking/rustls-tls"]

[dependencies]
anyhow = "1.0.75"
clap = { version = "4.4.6", features = ["derive"] }
console = { version = "0.15.7", features = ["windows-console-colors"] }
dirs = "5.0.1"
futures = "0.3.28"
indicatif = "0.17.7"
itertools = "0.11.0"
once_cell = "1.18.0"
rattler = { version = "0.16.2", path = "../rattler", default-features = false }
rattler_networking = { version = "0.16.2", path = "../rattler_networking", default-features = false }
rattler_conda_types = { version = "0.16.2", path = "../rattler_conda_types" }
rattler_repodata_gateway = { version = "0.16.2", path = "../rattler_repodata_gateway", features = ["sparse"], default-features = false }
rattler_solve = { version = "0.16.2", path = "../rattler_solve", features = ["resolvo", "libsolv_c"] }
rattler_virtual_packages = { version = "0.16.2", path = "../rattler_virtual_packages" }
reqwest = { version = "0.11.22", default-features = false }
reqwest-middleware = { version = "0.2.4" }
tokio = { version = "1.32.0", features = ["rt-multi-thread", "macros"] }
tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
anyhow = { workspace = true }
clap = { workspace = true, features = ["derive"] }
console = { workspace = true, features = ["windows-console-colors"] }
dirs = { workspace = true }
futures = { workspace = true }
indicatif = { workspace = true }
itertools = { workspace = true }
once_cell = { workspace = true }
rattler = { workspace = true }
rattler_conda_types = { workspace = true }
rattler_networking = { workspace = true }
rattler_repodata_gateway = { workspace = true, features = ["sparse"] }
rattler_solve = { workspace = true, features = ["resolvo", "libsolv_c"] }
rattler_virtual_packages = { workspace = true }
reqwest = { workspace = true }
reqwest-middleware = { workspace = true }
tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
tracing-subscriber = { workspace = true, features = ["env-filter", "fmt"] }

[package.metadata.release]
# Dont publish the binary
Expand Down
94 changes: 47 additions & 47 deletions crates/rattler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,53 +16,53 @@ native-tls = ['reqwest/native-tls', 'rattler_package_streaming/native-tls']
rustls-tls = ['reqwest/rustls-tls', 'rattler_package_streaming/rustls-tls']

[dependencies]
anyhow = "1.0.75"
async-compression = { version = "0.4.3", features = ["gzip", "tokio", "bzip2", "zstd"] }
bytes = "1.5.0"
chrono = { version = "0.4.31", default-features = false, features = ["std", "serde", "alloc"] }
digest = "0.10.7"
dirs = "5.0.1"
drop_bomb = "0.1.5"
futures = "0.3.28"
fxhash = "0.2.1"
hex = "0.4.3"
indexmap = "2.1.0"
itertools = "0.11.0"
memchr = "2.6.4"
memmap2 = "0.7.1"
nom = "7.1.3"
once_cell = "1.18.0"
pin-project-lite = "0.2.13"
rattler_conda_types = { version = "0.16.2", path = "../rattler_conda_types" }
rattler_digest = { version = "0.16.2", path = "../rattler_digest" }
rattler_networking = { version = "0.16.2", path = "../rattler_networking", default-features = false }
rattler_package_streaming = { version = "0.16.2", path = "../rattler_package_streaming", features = ["reqwest"], default-features = false }
reflink-copy = "0.1.14"
regex = "1.9.6"
reqwest = { version = "0.11.22", default-features = false, features = ["stream", "json", "gzip"] }
reqwest-middleware = "0.2.4"
serde = { version = "1.0.188", features = ["derive"] }
serde_json = { version = "1.0.107", features = ["raw_value"] }
serde_with = "3.3.0"
smallvec = { version = "1.11.1", features = ["serde", "const_new", "const_generics", "union"] }
tempfile = "3.8.0"
thiserror = "1.0.49"
tokio = { version = "1.32.0", features = ["rt", "io-util", "macros"] }
tokio-stream = "0.1.14"
tokio-util = { version = "0.7.9", features = ["codec", "io"] }
tracing = "0.1.37"
url = { version = "2.4.1", features = ["serde"] }
uuid = { version = "1.4.1", features = ["v4", "fast-rng"] }
anyhow = { workspace = true }
async-compression = { workspace = true }
bytes = { workspace = true }
chrono = { workspace = true }
digest = { workspace = true }
dirs = { workspace = true }
drop_bomb = { workspace = true }
futures = { workspace = true }
fxhash = { workspace = true }
hex = { workspace = true }
indexmap = { workspace = true }
itertools = { workspace = true }
memchr = { workspace = true }
memmap2 = { workspace = true }
nom = { workspace = true }
once_cell = { workspace = true }
pin-project-lite = { workspace = true }
rattler_conda_types = { workspace = true }
rattler_digest = { workspace = true }
rattler_networking = { workspace = true }
rattler_package_streaming = { workspace = true, features = ["reqwest"] }
reflink-copy = { workspace = true }
regex = { workspace = true }
reqwest = { workspace = true, features = ["stream", "json", "gzip"] }
reqwest-middleware = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
serde_with = { workspace = true }
smallvec = { workspace = true }
tempfile = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true, features = ["rt", "io-util", "macros"] }
tokio-stream = { workspace = true, features = ["sync"] }
tokio-util = { workspace = true, features = ["codec", "io"] }
tracing = { workspace = true }
url = { workspace = true, features = ["serde"] }
uuid = { workspace = true, features = ["v4", "fast-rng"] }

[dev-dependencies]
assert_matches = "1.5.0"
rand = "0.8.5"
rstest = "0.18.2"
tracing-test = { version = "0.2.4" }
insta = { version = "1.33.0", features = ["yaml"] }
rattler_lock = { path = "../rattler_lock" }
assert_matches = { workspace = true }
rand = { workspace = true }
rstest = { workspace = true }
tracing-test = { workspace = true }
insta = { workspace = true, features = ["yaml"] }
rattler_lock = { workspace = true }

tokio = { version = "1.32.0", features = ["macros", "rt-multi-thread"] }
axum = "0.6.20"
tower-http = { version = "0.4.4", features = ["fs"] }
tower = { version = "0.4.13", default-features = false, features = ["util"] }
tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
axum = { workspace = true }
tower-http = { workspace = true, features = ["fs"] }
tower = { workspace = true, features = ["util"] }
64 changes: 32 additions & 32 deletions crates/rattler_conda_types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,40 +11,40 @@ license.workspace = true
readme.workspace = true

[dependencies]
chrono = "0.4.31"
fxhash = "0.2.1"
hex = "0.4.3"
indexmap = { version = "2.0.2", features = ["serde"] }
itertools = "0.11.0"
lazy-regex = "3.0.2"
nom = "7.1.3"
regex = "1.9.6"
serde = { version = "1.0.188", features = ["derive", "rc"] }
serde_json = "1.0.107"
serde_yaml = "0.9.25"
serde_with = { version = "3.3.0", features = ["indexmap_2"] }
serde_repr = "0.1"
smallvec = { version = "1.11.1", features = ["serde", "const_new", "const_generics", "union"] }
strum = { version = "0.25.0", features = ["derive"] }
thiserror = "1.0.49"
tracing = "0.1.37"
url = { version = "2.4.1", features = ["serde"] }
rattler_digest = { version = "0.16.2", path = "../rattler_digest", features = ["serde"] }
rattler_macros = { version = "0.16.2", path = "../rattler_macros" }
glob = "0.3.1"
purl = { version = "0.1.2", features = ["serde"] }
chrono = { workspace = true }
fxhash = { workspace = true }
glob = { workspace = true }
hex = { workspace = true }
indexmap = { workspace = true, features = ["serde"] }
itertools = { workspace = true }
lazy-regex = { workspace = true }
nom = { workspace = true }
purl = { workspace = true, features = ["serde"] }
rattler_digest = { workspace = true, features = ["serde"] }
rattler_macros = { workspace = true }
regex = { workspace = true }
serde = { workspace = true, features = ["derive", "rc"] }
serde_json = { workspace = true }
serde_repr = { workspace = true }
serde_with = { workspace = true, features = ["indexmap_2"] }
serde_yaml = { workspace = true }
smallvec = { workspace = true, features = ["serde", "const_new", "const_generics", "union"] }
strum = { workspace = true, features = ["derive"] }
thiserror = { workspace = true }
tracing = { workspace = true }
url = { workspace = true, features = ["serde"] }

[dev-dependencies]
rand = "0.8.5"
insta = { version = "1.33.0", features = ["yaml", "redactions", "toml"] }
rattler_package_streaming = { path = "../rattler_package_streaming", default-features = false, features = ["rustls-tls"] }
tempfile = "3.8.0"
rstest = "0.18.2"
assert_matches = "1.5.0"
hex-literal = "0.4.1"
criterion = { version = "0.5", features = ["html_reports"] }
pathdiff = "0.2.1"
dunce = "1.0.4"
rand = { workspace = true }
insta = { workspace = true, features = ["yaml", "redactions", "toml"] }
rattler_package_streaming = { workspace = true, features = ["rustls-tls"] }
tempfile = { workspace = true }
rstest = { workspace = true }
assert_matches = { workspace = true }
hex-literal = { workspace = true }
criterion = { workspace = true, features = ["html_reports"] }
pathdiff = { workspace = true }
dunce = { workspace = true }

[[bench]]
name = "parse"
Expand Down
Loading

0 comments on commit c7e0cb0

Please sign in to comment.