Skip to content

Commit

Permalink
[CHORE] To the workspace with shared deps. (chroma-core#3224)
Browse files Browse the repository at this point in the history
This PR moves to the workspace's Cargo.toml any package used by both
chroma_load and another package.  It also drops patch version for easier
upgrades.
  • Loading branch information
rescrv authored Dec 3, 2024
1 parent 9ec6b33 commit c199996
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 50 deletions.
40 changes: 22 additions & 18 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,34 @@ members = [
]

[workspace.dependencies]
serde = { version = "1.0.215", features = ["derive"] }
serde_json = "1.0.133"
arrow = "52.2.0"
thiserror = "1.0.69"
uuid = { version = "1.11.0", features = [
"v4",
"fast-rng",
"macro-diagnostics",
"serde",
] }
async-trait = "0.1.83"
roaring = "0.10.6"
async-trait = "0.1"
chrono = { version = "0.4", features = ["serde"] }
clap = { version = "4", features = ["derive"] }
criterion = { version = "0.5", features = ["async_tokio"] }
figment = { version = "0.10.12", features = ["env", "yaml", "test"] }
flatbuffers = "24.3.25"
futures = "0.3"
num_cpus = "1.16.0"
opentelemetry = { version = "0.27.0", default-features = false, features = ["trace", "metrics"] }
opentelemetry-otlp = "0.27"
opentelemetry_sdk = { version = "0.27", features = ["rt-tokio"] }
parking_lot = { version = "0.12.3", features = ["serde"] }
tracing = "0.1"
tokio = { version = "1.41", features = ["macros", "rt-multi-thread"] }
tokio-util = "0.7.12"
tonic = "0.12"
prost = "0.13"
prost-types = "0.12"
num_cpus = "1.16.0"
flatbuffers = "24.3.25"
roaring = "0.10.6"
serde = { version = "1.0.215", features = ["derive"] }
serde_json = "1.0.133"
tantivy = "0.21.1"
criterion = { version = "0.5", features = ["async_tokio"] }
thiserror = "1.0.69"
tokio = { version = "1.41", features = ["macros", "rt-multi-thread"] }
tokio-util = "0.7.12"
tonic = "0.12"
tracing = "0.1"
tracing-bunyan-formatter = "0.3"
tracing-opentelemetry = "0.28.0"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
uuid = { version = "1.11.0", features = ["v4", "fast-rng", "macro-diagnostics", "serde"] }

chroma-benchmark = { path = "rust/benchmark" }
chroma-blockstore = { path = "rust/blockstore" }
Expand Down
2 changes: 1 addition & 1 deletion rust/benchmark/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ async-compression = { version = "0.4.18", features = [
] }

bincode = { workspace = true }
clap = { workspace = true }
criterion = { workspace = true }
futures = { workspace = true }
indicatif = { workspace = true }
Expand All @@ -27,7 +28,6 @@ tempfile = { workspace = true }
tokio = { workspace = true }
uuid = { workspace = true }

clap = { version = "4.5.21", features = ["derive"] }
dirs = "5.0.1"
reqwest = { version = "0.12.9", features = ["stream"] }
tokio-stream = { version = "0.1.16", features = ["full"] }
Expand Down
2 changes: 1 addition & 1 deletion rust/cache/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2021"
path = "src/lib.rs"

[dependencies]
clap = { version = "4", features = ["derive"] }
clap = { workspace = true }
foyer = "0.12"
anyhow = "1.0"
opentelemetry = { version = "0.27.0", default-features = false, features = [
Expand Down
38 changes: 18 additions & 20 deletions rust/load/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,26 @@ version = "0.1.0"
edition = "2021"

[dependencies]
async-trait = "0.1.83"
async-trait = { workspace = true }
chrono = { workspace = true }
clap = { workspace = true }
figment = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
tokio = { workspace = true }
uuid = { workspace = true }

tracing = { workspace = true }
tracing-bunyan-formatter = { workspace = true }
tracing-opentelemetry = { workspace = true }
tracing-subscriber = { workspace = true }
opentelemetry = { workspace = true }
opentelemetry-otlp = { workspace = true }
opentelemetry_sdk = { workspace = true }

# Unlikely to be used in the workspace.
axum = "0.7"
chromadb = { git = "https://github.com/rescrv/chromadb-rs", rev = "e364e35c34c660d4e8e862436ea600ddc2f46a1e" }
chrono = { version = "0.4.38", features = ["serde"] }
clap = { version = "4", features = ["derive"] }
figment = { version = "0.10.12", features = ["env", "yaml", "test"] }
guacamole = { version = "0.9", default-features = false }
serde.workspace = true

serde_json.workspace = true
tokio.workspace = true
uuid.workspace = true

tracing-bunyan-formatter = "0.3"
tracing-opentelemetry = "0.28.0"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
opentelemetry = { version = "0.27.0", default-features = false, features = [
"trace",
"metrics",
] }
opentelemetry-otlp = "0.27"
opentelemetry_sdk = { version = "0.27", features = ["rt-tokio"] }
tracing.workspace = true
tower-http = { version = "0.6.2", features = ["trace"] }
reqwest = { version = "0.12", features = ["json"] }
17 changes: 7 additions & 10 deletions rust/worker/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,13 @@ murmur3 = "0.5.2"
schemars = "0.8.21"
kube = { version = "0.87.2", features = ["runtime", "derive"] }
k8s-openapi = { version = "0.20.0", features = ["latest"] }
tracing-bunyan-formatter = "0.3"
tracing-opentelemetry = "0.28.0"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
opentelemetry = { version = "0.27.0", default-features = false, features = [
"trace",
"metrics",
] }
opentelemetry-otlp = "0.27"
opentelemetry_sdk = { version = "0.27", features = ["rt-tokio"] }
tracing-bunyan-formatter = { workspace = true }
tracing-opentelemetry = { workspace = true }
tracing-subscriber = { workspace = true }
opentelemetry = { workspace = true }
opentelemetry-otlp = { workspace = true }
opentelemetry_sdk = { workspace = true }
regex = "1.11.1"
figment = { version = "0.10.19", features = ["env", "yaml", "test"] }

[target.'cfg(not(target_env = "msvc"))'.dependencies]
tikv-jemallocator = "0.6"
Expand All @@ -39,6 +35,7 @@ thiserror = { workspace = true }
uuid = { workspace = true }
async-trait = { workspace = true }
roaring = { workspace = true }
figment = { workspace = true }
futures = { workspace = true }
parking_lot = { workspace = true }
tracing = { workspace = true }
Expand Down

0 comments on commit c199996

Please sign in to comment.