Skip to content

Commit c7e0cb0

Browse files
authored
chore: move all dependencies to workspace (#501)
1 parent f29e1ba commit c7e0cb0

File tree

17 files changed

+413
-288
lines changed

17 files changed

+413
-288
lines changed

Cargo.toml

+127-2
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,130 @@ tag-prefix = ""
2525
[profile.bench]
2626
lto = true
2727

28-
[patch.crates-io]
29-
#resolvo = { git = "https://github.com/mamba-org/resolvo.git", branch = "main" }
28+
[workspace.dependencies]
29+
anyhow = "1.0.75"
30+
async-compression = { version = "0.4.3", features = ["gzip", "tokio", "bzip2", "zstd"] }
31+
async-trait = "0.1.77"
32+
base64 = "0.21.7"
33+
bindgen = "0.66.1"
34+
bisection = "0.1.0"
35+
blake2 = "0.10.6"
36+
bytes = "1.5.0"
37+
bzip2 = "0.4.4"
38+
cache_control = "0.2.0"
39+
cfg-if = "1.0"
40+
chrono = { version = "0.4.31", default-features = false, features = ["std", "serde", "alloc"] }
41+
clap = { version = "4.4.6", features = ["derive"] }
42+
console = { version = "0.15.7", features = ["windows-console-colors"] }
43+
difference = "2.0.0"
44+
digest = "0.10.7"
45+
dirs = "5.0.1"
46+
drop_bomb = "0.1.5"
47+
enum_dispatch = "0.3.12"
48+
fs-err = "2.11.0"
49+
fslock = "0.2.1"
50+
futures = "0.3.28"
51+
futures-util = "0.3.28"
52+
fxhash = "0.2.1"
53+
getrandom = { version = "0.2.10", default-features = false }
54+
glob = "0.3.1"
55+
hex = "0.4.3"
56+
http-content-range = "0.1.2"
57+
humansize = "2.1.3"
58+
humantime = "2.1.0"
59+
indexmap = "2.1.0"
60+
indicatif = "0.17.7"
61+
itertools = "0.12.0"
62+
json-patch = "1.1.0"
63+
keyring = "2.0.5"
64+
lazy-regex = "3.0.2"
65+
lazy_static = "1.4.0"
66+
libc = { version = "0.2" }
67+
libloading = "0.8.1"
68+
libz-sys = { version = "1.1.12", default-features = false }
69+
md-5 = "0.10.6"
70+
memchr = "2.6.4"
71+
memmap2 = "0.9.0"
72+
netrc-rs = "0.1.2"
73+
nom = "7.1.3"
74+
num_cpus = "1.16.0"
75+
once_cell = "1.18.0"
76+
ouroboros = "0.17.2"
77+
pep440_rs = { version = "0.3.12" }
78+
pep508_rs = { version = "0.2.3" }
79+
pin-project-lite = "0.2.13"
80+
plist = "1"
81+
purl = { version = "0.1.2", features = ["serde"] }
82+
quote = "1.0.33"
83+
rattler = { version = "0.16.2", path = "crates/rattler", default-features = false }
84+
rattler_conda_types = { version = "0.16.2", path = "crates/rattler_conda_types", default-features = false }
85+
rattler_digest = { version = "0.16.2", path = "crates/rattler_digest", default-features = false }
86+
rattler_libsolv_c = { version = "0.16.2", path = "crates/rattler_libsolv_c", default-features = false }
87+
rattler_macros = { version = "0.16.2", path = "crates/rattler_macros", default-features = false }
88+
rattler_networking = { version = "0.16.2", path = "crates/rattler_networking", default-features = false }
89+
rattler_package_streaming = { version = "0.16.2", path = "crates/rattler_package_streaming", default-features = false }
90+
rattler_repodata_gateway = { version = "0.16.2", path = "crates/rattler_repodata_gateway", default-features = false }
91+
rattler_solve = { version = "0.16.2", path = "crates/rattler_solve", default-features = false }
92+
rattler_virtual_packages = { version = "0.16.2", path = "crates/rattler_virtual_packages", default-features = false }
93+
reflink-copy = "0.1.14"
94+
regex = "1.9.6"
95+
reqwest = { version = "0.11.22", default-features = false }
96+
reqwest-middleware = "0.2.4"
97+
resolvo = { version = "0.3.0" }
98+
retry-policies = { version = "0.2.0", default-features = false }
99+
serde = { version = "1.0.188" }
100+
serde-json-python-formatter = "0.1.0"
101+
serde_json = { version = "1.0.107" }
102+
serde_repr = "0.1"
103+
serde_with = "3.3.0"
104+
serde_yaml = "0.9.25"
105+
sha2 = "0.10.8"
106+
shlex = "1.3.0"
107+
smallvec = { version = "1.11.1", features = ["serde", "const_new", "const_generics", "union"] }
108+
strum = { version = "0.25.0", features = ["derive"] }
109+
superslice = "1.0.0"
110+
syn = "2.0.37"
111+
sysinfo = "0.29.10"
112+
tar = "0.4.40"
113+
task-local-extensions = "0.1.4"
114+
tempdir = "0.3.7"
115+
tempfile = "3.8.0"
116+
thiserror = "1.0"
117+
tokio = { version = "1.33.0", default-features = false }
118+
tokio-stream = "0.1.14"
119+
tokio-util = "0.7.9"
120+
tracing = "0.1.40"
121+
tracing-subscriber = { version = "0.3.17", default-features = false }
122+
url = { version = "2.4.1" }
123+
uuid = { version = "1.4.1", default-features = false }
124+
walkdir = "2.4.0"
125+
windows-sys = { version = "0.48.0", default-features = false }
126+
zip = { version = "0.6.6", default-features = false }
127+
zstd = { version = "0.12.4", default-features = false }
128+
129+
axum = { version = "0.6.20", default-features = false }
130+
tower-http = { version = "0.4.4", default-features = false }
131+
async_zip = { version = "0.0.15", default-features = false }
132+
assert_matches = "1.5.0"
133+
rstest = { version = "0.18.2" }
134+
135+
rand = "0.8.5"
136+
tracing-test = { version = "0.2.4" }
137+
insta = { version = "1.33.0" }
138+
rattler_lock = { version = "0.16.2", path = "crates/rattler_lock" }
139+
tower = { version = "0.4.13", default-features = false }
140+
141+
hex-literal = "0.4.1"
142+
criterion = "0.5"
143+
pathdiff = "0.2.1"
144+
dunce = "1.0.4"
145+
146+
cmake = "0.1.50"
147+
148+
similar-asserts = "1.5.0"
149+
150+
trybuild = { version = "1.0.85" }
151+
152+
rstest_reuse = "0.6.0"
153+
154+
test-log = "0.2.12"

crates/async_http_range_reader/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "async_http_range_reader"
33
authors = ["Bas Zalmstra <zalmstra.bas@gmail.com>"]
4-
version = "0.4.0"
4+
version = "0.5.0"
55
edition = "2021"
66
description = "A library for streaming reading of files over HTTP using range requests"
77
license = "BSD-3"
@@ -10,7 +10,7 @@ repository = "https://github.com/mamba-org/rattler"
1010
[dependencies]
1111
futures = "0.3.28"
1212
http-content-range = "0.1.2"
13-
itertools = "0.11.0"
13+
itertools = "0.12.0"
1414
bisection = "0.1.0"
1515
memmap2 = "0.9.0"
1616
reqwest = { version = "0.11.22", default-features = false, features = ["stream"] }

crates/rattler-bin/Cargo.toml

+18-18
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,24 @@ native-tls = ["reqwest/native-tls", "rattler/native-tls", "rattler_repodata_gate
2121
rustls-tls = ["reqwest/rustls-tls", "rattler/rustls-tls", "rattler_repodata_gateway/rustls-tls", "rattler_networking/rustls-tls"]
2222

2323
[dependencies]
24-
anyhow = "1.0.75"
25-
clap = { version = "4.4.6", features = ["derive"] }
26-
console = { version = "0.15.7", features = ["windows-console-colors"] }
27-
dirs = "5.0.1"
28-
futures = "0.3.28"
29-
indicatif = "0.17.7"
30-
itertools = "0.11.0"
31-
once_cell = "1.18.0"
32-
rattler = { version = "0.16.2", path = "../rattler", default-features = false }
33-
rattler_networking = { version = "0.16.2", path = "../rattler_networking", default-features = false }
34-
rattler_conda_types = { version = "0.16.2", path = "../rattler_conda_types" }
35-
rattler_repodata_gateway = { version = "0.16.2", path = "../rattler_repodata_gateway", features = ["sparse"], default-features = false }
36-
rattler_solve = { version = "0.16.2", path = "../rattler_solve", features = ["resolvo", "libsolv_c"] }
37-
rattler_virtual_packages = { version = "0.16.2", path = "../rattler_virtual_packages" }
38-
reqwest = { version = "0.11.22", default-features = false }
39-
reqwest-middleware = { version = "0.2.4" }
40-
tokio = { version = "1.32.0", features = ["rt-multi-thread", "macros"] }
41-
tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
24+
anyhow = { workspace = true }
25+
clap = { workspace = true, features = ["derive"] }
26+
console = { workspace = true, features = ["windows-console-colors"] }
27+
dirs = { workspace = true }
28+
futures = { workspace = true }
29+
indicatif = { workspace = true }
30+
itertools = { workspace = true }
31+
once_cell = { workspace = true }
32+
rattler = { workspace = true }
33+
rattler_conda_types = { workspace = true }
34+
rattler_networking = { workspace = true }
35+
rattler_repodata_gateway = { workspace = true, features = ["sparse"] }
36+
rattler_solve = { workspace = true, features = ["resolvo", "libsolv_c"] }
37+
rattler_virtual_packages = { workspace = true }
38+
reqwest = { workspace = true }
39+
reqwest-middleware = { workspace = true }
40+
tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
41+
tracing-subscriber = { workspace = true, features = ["env-filter", "fmt"] }
4242

4343
[package.metadata.release]
4444
# Dont publish the binary

crates/rattler/Cargo.toml

+47-47
Original file line numberDiff line numberDiff line change
@@ -16,53 +16,53 @@ native-tls = ['reqwest/native-tls', 'rattler_package_streaming/native-tls']
1616
rustls-tls = ['reqwest/rustls-tls', 'rattler_package_streaming/rustls-tls']
1717

1818
[dependencies]
19-
anyhow = "1.0.75"
20-
async-compression = { version = "0.4.3", features = ["gzip", "tokio", "bzip2", "zstd"] }
21-
bytes = "1.5.0"
22-
chrono = { version = "0.4.31", default-features = false, features = ["std", "serde", "alloc"] }
23-
digest = "0.10.7"
24-
dirs = "5.0.1"
25-
drop_bomb = "0.1.5"
26-
futures = "0.3.28"
27-
fxhash = "0.2.1"
28-
hex = "0.4.3"
29-
indexmap = "2.1.0"
30-
itertools = "0.11.0"
31-
memchr = "2.6.4"
32-
memmap2 = "0.7.1"
33-
nom = "7.1.3"
34-
once_cell = "1.18.0"
35-
pin-project-lite = "0.2.13"
36-
rattler_conda_types = { version = "0.16.2", path = "../rattler_conda_types" }
37-
rattler_digest = { version = "0.16.2", path = "../rattler_digest" }
38-
rattler_networking = { version = "0.16.2", path = "../rattler_networking", default-features = false }
39-
rattler_package_streaming = { version = "0.16.2", path = "../rattler_package_streaming", features = ["reqwest"], default-features = false }
40-
reflink-copy = "0.1.14"
41-
regex = "1.9.6"
42-
reqwest = { version = "0.11.22", default-features = false, features = ["stream", "json", "gzip"] }
43-
reqwest-middleware = "0.2.4"
44-
serde = { version = "1.0.188", features = ["derive"] }
45-
serde_json = { version = "1.0.107", features = ["raw_value"] }
46-
serde_with = "3.3.0"
47-
smallvec = { version = "1.11.1", features = ["serde", "const_new", "const_generics", "union"] }
48-
tempfile = "3.8.0"
49-
thiserror = "1.0.49"
50-
tokio = { version = "1.32.0", features = ["rt", "io-util", "macros"] }
51-
tokio-stream = "0.1.14"
52-
tokio-util = { version = "0.7.9", features = ["codec", "io"] }
53-
tracing = "0.1.37"
54-
url = { version = "2.4.1", features = ["serde"] }
55-
uuid = { version = "1.4.1", features = ["v4", "fast-rng"] }
19+
anyhow = { workspace = true }
20+
async-compression = { workspace = true }
21+
bytes = { workspace = true }
22+
chrono = { workspace = true }
23+
digest = { workspace = true }
24+
dirs = { workspace = true }
25+
drop_bomb = { workspace = true }
26+
futures = { workspace = true }
27+
fxhash = { workspace = true }
28+
hex = { workspace = true }
29+
indexmap = { workspace = true }
30+
itertools = { workspace = true }
31+
memchr = { workspace = true }
32+
memmap2 = { workspace = true }
33+
nom = { workspace = true }
34+
once_cell = { workspace = true }
35+
pin-project-lite = { workspace = true }
36+
rattler_conda_types = { workspace = true }
37+
rattler_digest = { workspace = true }
38+
rattler_networking = { workspace = true }
39+
rattler_package_streaming = { workspace = true, features = ["reqwest"] }
40+
reflink-copy = { workspace = true }
41+
regex = { workspace = true }
42+
reqwest = { workspace = true, features = ["stream", "json", "gzip"] }
43+
reqwest-middleware = { workspace = true }
44+
serde = { workspace = true }
45+
serde_json = { workspace = true }
46+
serde_with = { workspace = true }
47+
smallvec = { workspace = true }
48+
tempfile = { workspace = true }
49+
thiserror = { workspace = true }
50+
tokio = { workspace = true, features = ["rt", "io-util", "macros"] }
51+
tokio-stream = { workspace = true, features = ["sync"] }
52+
tokio-util = { workspace = true, features = ["codec", "io"] }
53+
tracing = { workspace = true }
54+
url = { workspace = true, features = ["serde"] }
55+
uuid = { workspace = true, features = ["v4", "fast-rng"] }
5656

5757
[dev-dependencies]
58-
assert_matches = "1.5.0"
59-
rand = "0.8.5"
60-
rstest = "0.18.2"
61-
tracing-test = { version = "0.2.4" }
62-
insta = { version = "1.33.0", features = ["yaml"] }
63-
rattler_lock = { path = "../rattler_lock" }
58+
assert_matches = { workspace = true }
59+
rand = { workspace = true }
60+
rstest = { workspace = true }
61+
tracing-test = { workspace = true }
62+
insta = { workspace = true, features = ["yaml"] }
63+
rattler_lock = { workspace = true }
6464

65-
tokio = { version = "1.32.0", features = ["macros", "rt-multi-thread"] }
66-
axum = "0.6.20"
67-
tower-http = { version = "0.4.4", features = ["fs"] }
68-
tower = { version = "0.4.13", default-features = false, features = ["util"] }
65+
tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
66+
axum = { workspace = true }
67+
tower-http = { workspace = true, features = ["fs"] }
68+
tower = { workspace = true, features = ["util"] }

crates/rattler_conda_types/Cargo.toml

+32-32
Original file line numberDiff line numberDiff line change
@@ -11,40 +11,40 @@ license.workspace = true
1111
readme.workspace = true
1212

1313
[dependencies]
14-
chrono = "0.4.31"
15-
fxhash = "0.2.1"
16-
hex = "0.4.3"
17-
indexmap = { version = "2.0.2", features = ["serde"] }
18-
itertools = "0.11.0"
19-
lazy-regex = "3.0.2"
20-
nom = "7.1.3"
21-
regex = "1.9.6"
22-
serde = { version = "1.0.188", features = ["derive", "rc"] }
23-
serde_json = "1.0.107"
24-
serde_yaml = "0.9.25"
25-
serde_with = { version = "3.3.0", features = ["indexmap_2"] }
26-
serde_repr = "0.1"
27-
smallvec = { version = "1.11.1", features = ["serde", "const_new", "const_generics", "union"] }
28-
strum = { version = "0.25.0", features = ["derive"] }
29-
thiserror = "1.0.49"
30-
tracing = "0.1.37"
31-
url = { version = "2.4.1", features = ["serde"] }
32-
rattler_digest = { version = "0.16.2", path = "../rattler_digest", features = ["serde"] }
33-
rattler_macros = { version = "0.16.2", path = "../rattler_macros" }
34-
glob = "0.3.1"
35-
purl = { version = "0.1.2", features = ["serde"] }
14+
chrono = { workspace = true }
15+
fxhash = { workspace = true }
16+
glob = { workspace = true }
17+
hex = { workspace = true }
18+
indexmap = { workspace = true, features = ["serde"] }
19+
itertools = { workspace = true }
20+
lazy-regex = { workspace = true }
21+
nom = { workspace = true }
22+
purl = { workspace = true, features = ["serde"] }
23+
rattler_digest = { workspace = true, features = ["serde"] }
24+
rattler_macros = { workspace = true }
25+
regex = { workspace = true }
26+
serde = { workspace = true, features = ["derive", "rc"] }
27+
serde_json = { workspace = true }
28+
serde_repr = { workspace = true }
29+
serde_with = { workspace = true, features = ["indexmap_2"] }
30+
serde_yaml = { workspace = true }
31+
smallvec = { workspace = true, features = ["serde", "const_new", "const_generics", "union"] }
32+
strum = { workspace = true, features = ["derive"] }
33+
thiserror = { workspace = true }
34+
tracing = { workspace = true }
35+
url = { workspace = true, features = ["serde"] }
3636

3737
[dev-dependencies]
38-
rand = "0.8.5"
39-
insta = { version = "1.33.0", features = ["yaml", "redactions", "toml"] }
40-
rattler_package_streaming = { path = "../rattler_package_streaming", default-features = false, features = ["rustls-tls"] }
41-
tempfile = "3.8.0"
42-
rstest = "0.18.2"
43-
assert_matches = "1.5.0"
44-
hex-literal = "0.4.1"
45-
criterion = { version = "0.5", features = ["html_reports"] }
46-
pathdiff = "0.2.1"
47-
dunce = "1.0.4"
38+
rand = { workspace = true }
39+
insta = { workspace = true, features = ["yaml", "redactions", "toml"] }
40+
rattler_package_streaming = { workspace = true, features = ["rustls-tls"] }
41+
tempfile = { workspace = true }
42+
rstest = { workspace = true }
43+
assert_matches = { workspace = true }
44+
hex-literal = { workspace = true }
45+
criterion = { workspace = true, features = ["html_reports"] }
46+
pathdiff = { workspace = true }
47+
dunce = { workspace = true }
4848

4949
[[bench]]
5050
name = "parse"

0 commit comments

Comments
 (0)