Skip to content

Commit 3b16e30

Browse files
committed
refactor: migrate crate packages into workspace cargo.toml
1 parent fe1766a commit 3b16e30

File tree

9 files changed

+30
-20
lines changed

9 files changed

+30
-20
lines changed

Cargo.toml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,18 @@ version = "0.1.4"
2222
blocks_in_conditions = "allow" # opentelemetry tracing macro would be noisy
2323

2424
[workspace.dependencies]
25+
cdl = { version = "0.1.4", path = "crates/cdl", default-features = false }
26+
cdl-catalog = { version = "0.1.4", path = "crates/cdl-catalog", default-features = false }
27+
cdl-core = { version = "0.1.4", path = "crates/cdl-core", default-features = false }
28+
cdl-fs = { version = "0.1.4", path = "crates/cdl-fs", default-features = false }
29+
cdl-fuse = { version = "0.1.4", path = "crates/cdl-fuse", default-features = false }
30+
cdl-k8s-core = { version = "0.1.4", path = "crates/cdl-k8s-core", default-features = false }
31+
cdl-k8s-operator = { version = "0.1.4", path = "crates/cdl-k8s-operator", default-features = false }
32+
cdl-k8s-provider = { version = "0.1.4", path = "crates/cdl-k8s-provider", default-features = false }
33+
cdl-openapi = { version = "0.1.4", path = "crates/cdl-openapi", default-features = false }
34+
cdl-python = { version = "0.1.4", path = "python", default-features = false }
35+
cdl-store = { version = "0.1.4", path = "crates/cdl-store", default-features = false }
36+
2537
anyhow = { version = "1.0", features = ["backtrace"] }
2638
argon2 = { version = "0.5" }
2739
arrow = { version = "52", default-features = false, features = [ # depends: lance

crates/cdl-fs/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ serde = ["dep:serde"]
2727
gpu-nvidia = ["lance/tensorflow"]
2828

2929
[dependencies]
30-
cdl-catalog = { path = "../cdl-catalog" }
31-
cdl-store = { path = "../cdl-store" }
30+
cdl-catalog = { workspace = true }
31+
cdl-store = { workspace = true }
3232

3333
anyhow = { workspace = true }
3434
arrow = { workspace = true }

crates/cdl-fuse/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ workspace = true
2020
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
2121

2222
[dependencies]
23-
cdl-catalog = { path = "../cdl-catalog" }
24-
cdl-fs = { path = "../cdl-fs" }
23+
cdl-catalog = { workspace = true }
24+
cdl-fs = { workspace = true }
2525

2626
anyhow = { workspace = true }
2727
async-trait = { workspace = true }

crates/cdl-k8s-operator/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ rustls-tls = [
3838
]
3939

4040
[dependencies]
41-
cdl-k8s-core = { path = "../cdl-k8s-core", features = [
41+
cdl-k8s-core = { workspace = true, features = [
4242
"env",
4343
"k8s-operator",
4444
"opentelemetry-all",
4545
"opentelemetry-otlp",
4646
] }
47-
cdl-k8s-provider = { path = "../cdl-k8s-provider" }
48-
cdl-openapi = { path = "../cdl-openapi", features = ["k8s"] }
47+
cdl-k8s-provider = { workspace = true }
48+
cdl-openapi = { workspace = true, features = ["k8s"] }
4949

5050
anyhow = { workspace = true }
5151
async-trait = { workspace = true }

crates/cdl-k8s-provider/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ openssl-tls = [
3232
rustls-tls = ["cdl-k8s-core/rustls-tls", "kube/rustls-tls", "minio/rustls-tls"]
3333

3434
[dependencies]
35-
cdl-k8s-core = { path = "../cdl-k8s-core", features = ["openapi"] }
36-
cdl-openapi = { path = "../cdl-openapi", features = ["k8s"] }
35+
cdl-k8s-core = { workspace = true, features = ["openapi"] }
36+
cdl-openapi = { workspace = true, features = ["k8s"] }
3737

3838
anyhow = { workspace = true }
3939
argon2 = { workspace = true }

crates/cdl-openapi/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ default = []
2424
k8s = ["dep:kube", "dep:serde_json"]
2525

2626
[dependencies]
27-
cdl-k8s-core = { path = "../cdl-k8s-core", features = ["openapi"] }
27+
cdl-k8s-core = { workspace = true, features = ["openapi"] }
2828

2929
anyhow = { workspace = true }
3030
byte-unit = { workspace = true }

crates/cdl-store/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ workspace = true
2020
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
2121

2222
[dependencies]
23-
cdl-catalog = { path = "../cdl-catalog" }
23+
cdl-catalog = { workspace = true }
2424

2525
async-trait = { workspace = true }
2626
bytes = { workspace = true }

crates/cdl/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ default = []
2626
gpu-nvidia = ["cdl-fs/gpu-nvidia"]
2727

2828
[dependencies]
29-
cdl-catalog = { path = "../cdl-catalog" }
30-
cdl-fs = { path = "../cdl-fs" }
31-
cdl-k8s-core = { path = "../cdl-k8s-core", features = ["opentelemetry-all"] }
29+
cdl-catalog = { workspace = true }
30+
cdl-fs = { workspace = true }
31+
cdl-k8s-core = { workspace = true, features = ["opentelemetry-all"] }
3232

3333
anyhow = { workspace = true }
3434
clap = { workspace = true }
3535
tokio = { workspace = true, features = ["full"] }
3636
tracing = { workspace = true }
3737

3838
[target.'cfg(target_os = "linux")'.dependencies]
39-
cdl-fuse = { path = "../cdl-fuse" }
39+
cdl-fuse = { workspace = true }

python/Cargo.toml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,9 @@ doc = false
2525
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
2626

2727
[dependencies]
28-
cdl-catalog = { path = "../crates/cdl-catalog", features = ["serde"] }
29-
cdl-fs = { path = "../crates/cdl-fs" }
30-
cdl-k8s-core = { path = "../crates/cdl-k8s-core", features = [
31-
"opentelemetry-all",
32-
] }
28+
cdl-catalog = { workspace = true, features = ["serde"] }
29+
cdl-fs = { workspace = true }
30+
cdl-k8s-core = { workspace = true, features = ["opentelemetry-all"] }
3331

3432
anyhow = { workspace = true }
3533
arrow = { workspace = true, features = ["pyarrow"] }

0 commit comments

Comments
 (0)