Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(rust): Move dependency version info to workspace level #10295

Merged
merged 6 commits into from
Aug 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 23 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,35 @@ repository = "https://github.com/pola-rs/polars"
license = "MIT"

[workspace.dependencies]
rayon = "1.6"
thiserror = "^1"
num-traits = "0.2"
ahash = "0.8"
xxhash-rust = { version = "0.8.6", features = ["xxh3"] }
atoi = "2.0.0"
bitflags = "1.3"
chrono = { version = "0.4", default-features = false, features = ["std"] }
chrono-tz = "0.8"
ciborium = "0.2"
either = "1.8"
futures = "0.3.25"
hashbrown = { version = "0.14.0", features = ["rayon", "ahash"] }
indexmap = { version = "2", features = ["std"] }
bitflags = "1.3"
once_cell = "1"
memchr = "2"
smartstring = { version = "1" }
multiversion = "0.7"
either = "1.8"
num-traits = "0.2"
object_store = { version = "0.6.0", default-features = false }
once_cell = "1"
pyo3 = "0.19"
rand = "0.8"
rayon = "1.6"
regex = "1.6"
serde = "1"
serde_json = "1"
simd-json = { version = "0.10", features = ["allow-non-simd", "known-key"] }
smartstring = "1"
sqlparser = "0.34"
strum_macros = "0.25"
thiserror = "^1"
url = "2.3.1"
version_check = "0.9.4"
xxhash-rust = { version = "0.8.6", features = ["xxh3"] }

[workspace.dependencies.arrow]
package = "arrow2"
Expand All @@ -59,6 +73,7 @@ features = [
"compute_filter",
"compute_if_then_else",
]

[patch.crates-io]
# packed_simd_2 = { git = "https://github.com/rust-lang/packed_simd", rev = "e57c7ba11386147e6d2cbad7c88f376aab4bdc86" }
# simd-json = { git = "https://github.com/ritchie46/simd-json", branch = "alignment" }
Expand Down
18 changes: 9 additions & 9 deletions crates/polars-arrow/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ description = "Arrow interfaces for Polars DataFrame library"
[dependencies]
polars-error = { version = "0.31.1", path = "../polars-error" }

arrow.workspace = true
atoi = { version = "2.0.0", optional = true }
chrono = { version = "0.4", default-features = false, features = ["std"], optional = true }
chrono-tz = { version = "0.8", optional = true }
arrow = { workspace = true }
atoi = { workspace = true, optional = true }
chrono = { workspace = true, optional = true }
chrono-tz = { workspace = true, optional = true }
ethnum = { version = "1.3.2", optional = true }
hashbrown.workspace = true
multiversion.workspace = true
num-traits.workspace = true
serde = { version = "1", features = ["derive"], optional = true }
thiserror.workspace = true
hashbrown = { workspace = true }
multiversion = { workspace = true }
num-traits = { workspace = true }
serde = { workspace = true, features = ["derive"], optional = true }
thiserror = { workspace = true }

[build-dependencies]
version_check = { workspace = true }
Expand Down
46 changes: 23 additions & 23 deletions crates/polars-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,35 +14,35 @@ polars-error = { version = "0.31.1", path = "../polars-error" }
polars-row = { version = "0.31.1", path = "../polars-row" }
polars-utils = { version = "0.31.1", path = "../polars-utils" }

ahash.workspace = true
arrow.workspace = true
bitflags.workspace = true
chrono = { version = "0.4", default-features = false, features = ["std"], optional = true }
chrono-tz = { version = "0.8", optional = true }
comfy-table = { version = "7.0.1", optional = true, default_features = false }
either.workspace = true
hashbrown.workspace = true
indexmap.workspace = true
ahash = { workspace = true }
arrow = { workspace = true }
bitflags = { workspace = true }
chrono = { workspace = true, optional = true }
chrono-tz = { workspace = true, optional = true }
comfy-table = { version = "7.0.1", default_features = false, optional = true }
either = { workspace = true }
hashbrown = { workspace = true }
indexmap = { workspace = true }
itoap = { version = "1", optional = true, features = ["simd"] }
ndarray = { version = "0.15", optional = true, default_features = false }
num-traits.workspace = true
object_store = { version = "0.6.0", default-features = false, optional = true }
once_cell.workspace = true
rand = { version = "0.8", optional = true, features = ["small_rng", "std"] }
num-traits = { workspace = true }
object_store = { workspace = true, optional = true }
once_cell = { workspace = true }
rand = { workspace = true, optional = true, features = ["small_rng", "std"] }
rand_distr = { version = "0.4", optional = true }
rayon.workspace = true
regex = { version = "1.6", optional = true }
rayon = { workspace = true }
regex = { workspace = true, optional = true }
# activate if you want serde support for Series and DataFrames
serde = { version = "1", features = ["derive"], optional = true }
serde_json = { version = "1", optional = true }
smartstring.workspace = true
thiserror.workspace = true
url = { version = "2.3.1", optional = true }
xxhash-rust.workspace = true
serde = { workspace = true, features = ["derive"], optional = true }
serde_json = { workspace = true, optional = true }
smartstring = { workspace = true }
thiserror = { workspace = true }
url = { workspace = true, optional = true }
xxhash-rust = { workspace = true }

[dev-dependencies]
bincode = "1"
serde_json = "1"
bincode = { version = "1" }
serde_json = { workspace = true }

[build-dependencies]
version_check = { workspace = true }
Expand Down
6 changes: 3 additions & 3 deletions crates/polars-error/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ repository = { workspace = true }
description = "Error definitions for the Polars DataFrame library"

[dependencies]
arrow.workspace = true
regex = { version = "1.6", optional = true }
thiserror.workspace = true
arrow = { workspace = true }
regex = { workspace = true, optional = true }
thiserror = { workspace = true }
32 changes: 16 additions & 16 deletions crates/polars-io/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,31 @@ polars-json = { version = "0.31.1", optional = true, path = "../polars-json" }
polars-time = { version = "0.31.1", path = "../polars-time", features = [], default-features = false, optional = true }
polars-utils = { version = "0.31.1", path = "../polars-utils" }

ahash.workspace = true
arrow.workspace = true
ahash = { workspace = true }
arrow = { workspace = true }
async-trait = { version = "0.1.59", optional = true }
bytes = "1.3.0"
chrono = { version = "0.4", default-features = false, features = ["std"], optional = true }
bytes = { version = "1.3.0" }
chrono = { workspace = true, optional = true }
chrono-tz = { version = "0.8.1", optional = true }
fast-float = { version = "0.2.0", optional = true }
flate2 = { version = "1", optional = true, default-features = false }
futures = { version = "0.3.25", optional = true }
home = "0.5.4"
futures = { workspace = true, optional = true }
home = { version = "0.5.4" }
lexical = { version = "6", optional = true, default-features = false, features = ["std", "parse-integers"] }
lexical-core = { version = "0.8", optional = true }
memchr.workspace = true
memchr = { workspace = true }
memmap = { package = "memmap2", version = "0.5.2", optional = true }
num-traits.workspace = true
object_store = { version = "0.6.0", default-features = false, optional = true }
once_cell = "1"
rayon.workspace = true
regex = "1.6"
serde = { version = "1", features = ["derive"], optional = true }
serde_json = { version = "1", optional = true, default-features = false, features = ["alloc", "raw_value"] }
simd-json = { version = "0.10", optional = true, features = ["allow-non-simd", "known-key"] }
num-traits = { workspace = true }
object_store = { workspace = true, optional = true }
once_cell = { workspace = true }
rayon = { workspace = true }
regex = { workspace = true }
serde = { workspace = true, features = ["derive"], optional = true }
serde_json = { version = "1", default-features = false, features = ["alloc", "raw_value"], optional = true }
simd-json = { workspace = true, optional = true }
simdutf8 = { version = "0.1", optional = true }
tokio = { version = "1.26.0", features = ["net"], optional = true }
url = { version = "2.3.1", optional = true }
url = { workspace = true, optional = true }

[dev-dependencies]
tempdir = "0.3.7"
Expand Down
14 changes: 7 additions & 7 deletions crates/polars-json/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ polars-arrow = { version = "0.31.1", path = "../polars-arrow", default-features
polars-error = { version = "0.31.1", path = "../polars-error" }
polars-utils = { version = "0.31.1", path = "../polars-utils" }

ahash.workspace = true
arrow.workspace = true
fallible-streaming-iterator = "0.1"
hashbrown.workspace = true
indexmap.workspace = true
num-traits.workspace = true
simd-json = { version = "0.10", features = ["allow-non-simd", "known-key"] }
ahash = { workspace = true }
arrow = { workspace = true }
fallible-streaming-iterator = { version = "0.1" }
hashbrown = { workspace = true }
indexmap = { workspace = true }
num-traits = { workspace = true }
simd-json = { workspace = true }
16 changes: 8 additions & 8 deletions crates/polars-lazy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ polars-plan = { version = "0.31.1", path = "../polars-plan" }
polars-time = { version = "0.31.1", path = "../polars-time", optional = true }
polars-utils = { version = "0.31.1", path = "../polars-utils" }

ahash.workspace = true
bitflags.workspace = true
glob = "0.3"
once_cell = "1"
pyo3 = { version = "0.19", optional = true }
rayon.workspace = true
smartstring.workspace = true
ahash = { workspace = true }
bitflags = { workspace = true }
glob = { version = "0.3" }
once_cell = { workspace = true }
pyo3 = { workspace = true, optional = true }
rayon = { workspace = true }
smartstring = { workspace = true }

[dev-dependencies]
serde_json = "1"
serde_json = { workspace = true }

[build-dependencies]
version_check = { workspace = true }
Expand Down
18 changes: 9 additions & 9 deletions crates/polars-ops/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ polars-json = { version = "0.31.1", optional = true, path = "../polars-json", de
polars-utils = { version = "0.31.1", path = "../polars-utils", default-features = false }

argminmax = { version = "0.6.1", default-features = false, features = ["float"] }
arrow.workspace = true
arrow = { workspace = true }
base64 = { version = "0.21", optional = true }
chrono = { version = "0.4", default-features = false, features = ["std"], optional = true }
chrono-tz = { version = "0.8", optional = true }
either.workspace = true
chrono = { workspace = true, optional = true }
chrono-tz = { workspace = true, optional = true }
either = { workspace = true }
hex = { version = "0.4", optional = true }
indexmap.workspace = true
indexmap = { workspace = true }
jsonpath_lib = { version = "0.3.0", optional = true, git = "https://github.com/ritchie46/jsonpath", branch = "improve_compiled" }
memchr.workspace = true
serde = { version = "1", features = ["derive"], optional = true }
serde_json = { version = "1", optional = true }
smartstring.workspace = true
memchr = { workspace = true }
serde = { workspace = true, features = ["derive"], optional = true }
serde_json = { workspace = true, optional = true }
smartstring = { workspace = true }

[build-dependencies]
version_check = { workspace = true }
Expand Down
10 changes: 5 additions & 5 deletions crates/polars-pipe/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ polars-utils = { version = "0.31.1", path = "../polars-utils", features = ["sysi

crossbeam-channel = { version = "0.5", optional = true }
crossbeam-queue = { version = "0.3", optional = true }
enum_dispatch = "0.3"
hashbrown.workspace = true
num-traits.workspace = true
rayon.workspace = true
smartstring = { version = "1" }
enum_dispatch = { version = "0.3" }
hashbrown = { workspace = true }
num-traits = { workspace = true }
rayon = { workspace = true }
smartstring = { workspace = true }

[build-dependencies]
version_check = { workspace = true }
Expand Down
26 changes: 13 additions & 13 deletions crates/polars-plan/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@ polars-ops = { version = "0.31.1", path = "../polars-ops", default-features = fa
polars-time = { version = "0.31.1", path = "../polars-time", optional = true }
polars-utils = { version = "0.31.1", path = "../polars-utils" }

ahash.workspace = true
arrow.workspace = true
chrono = { version = "0.4", optional = true }
chrono-tz = { version = "0.8", optional = true }
ciborium = { version = "0.2", optional = true }
futures = { version = "0.3.25", optional = true }
once_cell.workspace = true
pyo3 = { version = "0.19", optional = true }
rayon.workspace = true
regex = { version = "1.6", optional = true }
serde = { version = "1", features = ["derive", "rc"], optional = true }
smartstring.workspace = true
strum_macros.workspace = true
ahash = { workspace = true }
arrow = { workspace = true }
chrono = { workspace = true, optional = true }
chrono-tz = { workspace = true, optional = true }
ciborium = { workspace = true, optional = true }
futures = { workspace = true, optional = true }
once_cell = { workspace = true }
pyo3 = { workspace = true, optional = true }
rayon = { workspace = true }
regex = { workspace = true, optional = true }
serde = { workspace = true, features = ["derive", "rc"], optional = true }
smartstring = { workspace = true }
strum_macros = { workspace = true }

[build-dependencies]
version_check = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/polars-row/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ description = "Row encodings for the Polars DataFrame library"
polars-error = { version = "0.31.1", path = "../polars-error" }
polars-utils = { version = "0.31.1", path = "../polars-utils" }

arrow.workspace = true
arrow = { workspace = true }
6 changes: 3 additions & 3 deletions crates/polars-sql/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ polars-core = { version = "0.31.1", path = "../polars-core", features = [] }
polars-lazy = { version = "0.31.1", path = "../polars-lazy", features = ["compile", "strings", "cross_join", "trigonometry", "abs", "round_series", "log", "regex", "is_in", "meta", "cum_agg"] }
polars-plan = { version = "0.31.1", path = "../polars-plan", features = ["compile"] }

serde = "1"
serde_json = { version = "1" }
serde = { workspace = true }
serde_json = { workspace = true }
sqlparser = { workspace = true }
# sqlparser = { git = "https://github.com/sqlparser-rs/sqlparser-rs.git", rev = "ae3b5844c839072c235965fe0d1bddc473dced87" }
sqlparser = "0.34"

[features]
csv = ["polars-lazy/csv"]
Expand Down
18 changes: 9 additions & 9 deletions crates/polars-time/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ polars-core = { version = "0.31.1", path = "../polars-core", default-features =
polars-ops = { version = "0.31.1", path = "../polars-ops" }
polars-utils = { version = "0.31.1", path = "../polars-utils" }

arrow.workspace = true
atoi = "2.0.0"
chrono = { version = "0.4", default-features = false, features = ["std"] }
chrono-tz = { version = "0.8", optional = true }
now = "0.1"
once_cell.workspace = true
regex = "1.7.1"
serde = { version = "1", features = ["derive"], optional = true }
smartstring.workspace = true
arrow = { workspace = true }
atoi = { workspace = true }
chrono = { workspace = true }
chrono-tz = { workspace = true, optional = true }
now = { version = "0.1" }
once_cell = { workspace = true }
regex = { version = "1.7.1" }
serde = { workspace = true, features = ["derive"], optional = true }
smartstring = { workspace = true }

[features]
dtype-date = ["polars-core/dtype-date", "polars-core/temporal"]
Expand Down
12 changes: 6 additions & 6 deletions crates/polars-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ description = "Private utils for the Polars DataFrame library"
[dependencies]
polars-error = { version = "0.31.1", path = "../polars-error" }

ahash.workspace = true
hashbrown.workspace = true
num-traits.workspace = true
once_cell.workspace = true
rayon.workspace = true
smartstring.workspace = true
ahash = { workspace = true }
hashbrown = { workspace = true }
num-traits = { workspace = true }
once_cell = { workspace = true }
rayon = { workspace = true }
smartstring = { workspace = true }
sysinfo = { version = "0.29", default-features = false, optional = true }

[build-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions crates/polars/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ polars-sql = { version = "0.31.1", path = "../polars-sql", default-features = fa
polars-time = { version = "0.31.1", path = "../polars-time", default-features = false, optional = true }

[dev-dependencies]
ahash = "0.8"
rand = "0.8"
ahash = { workspace = true }
rand = { workspace = true }

[build-dependencies]
version_check = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion examples/python_rust_compiled_function/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ crate-type = ["cdylib"]
polars = { path = "../../crates/polars" }
polars-arrow = { path = "../../crates/polars-arrow" }

pyo3 = { version = "0.19", features = ["extension-module"] }
pyo3 = { workspace = true, features = ["extension-module"] }

[build-dependencies]
pyo3-build-config = "0.19"
Loading