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.

Sign up for GitHub

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

Uplift keys/dependencies to use more workspace inheritance #9293

Merged
merged 4 commits into from
Feb 29, 2024
Merged

Uplift keys/dependencies to use more workspace inheritance #9293

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
20ff54a
Uplift keys/dependencies to use more workspace inheritance
Jefffrey Feb 20, 2024
f6f5a2a
Merge branch 'main' into uplift_workspace_inheritance
Jefffrey Feb 28, 2024
89f0e30
Update comment
Jefffrey Feb 28, 2024
5209489
Whitespace
Jefffrey Feb 28, 2024
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
10 changes: 5 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,14 @@ bytes = "1.4"
chrono = { version = "0.4.34", default-features = false }
ctor = "0.2.0"
dashmap = "5.4.0"
datafusion = { path = "datafusion/core", version = "36.0.0" }
datafusion-common = { path = "datafusion/common", version = "36.0.0" }
datafusion = { path = "datafusion/core", version = "36.0.0", default-features = false }
Jefffrey marked this conversation as resolved.
Show resolved Hide resolved
datafusion-common = { path = "datafusion/common", version = "36.0.0", default-features = false }
datafusion-execution = { path = "datafusion/execution", version = "36.0.0" }
datafusion-expr = { path = "datafusion/expr", version = "36.0.0" }
datafusion-functions = { path = "datafusion/functions", version = "36.0.0" }
datafusion-functions-array = { path = "datafusion/functions-array", version = "36.0.0" }
datafusion-optimizer = { path = "datafusion/optimizer", version = "36.0.0" }
datafusion-physical-expr = { path = "datafusion/physical-expr", version = "36.0.0" }
datafusion-optimizer = { path = "datafusion/optimizer", version = "36.0.0", default-features = false }
datafusion-physical-expr = { path = "datafusion/physical-expr", version = "36.0.0", default-features = false }
datafusion-physical-plan = { path = "datafusion/physical-plan", version = "36.0.0" }
datafusion-proto = { path = "datafusion/proto", version = "36.0.0" }
datafusion-sql = { path = "datafusion/sql", version = "36.0.0" }
Expand All @@ -81,7 +81,7 @@ datafusion-substrait = { path = "datafusion/substrait", version = "36.0.0" }
doc-comment = "0.3"
env_logger = "0.11"
futures = "0.3"
half = "2.2.1"
half = { version = "2.2.1", default-features = false }
indexmap = "2.0.0"
itertools = "0.12"
log = "^0.4"
Expand Down
16 changes: 8 additions & 8 deletions benchmarks/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
[package]
name = "datafusion-benchmarks"
description = "DataFusion Benchmarks"
version = "36.0.0"
version = { workspace = true }
edition = { workspace = true }
authors = ["Apache Arrow <dev@arrow.apache.org>"]
homepage = "https://github.com/apache/arrow-datafusion"
repository = "https://github.com/apache/arrow-datafusion"
license = "Apache-2.0"
authors = { workspace = true }
homepage = { workspace = true }
repository = { workspace = true }
license = { workspace = true }
rust-version = { workspace = true }

[features]
Expand All @@ -33,8 +33,8 @@ snmalloc = ["snmalloc-rs"]

[dependencies]
arrow = { workspace = true }
datafusion = { path = "../datafusion/core", version = "36.0.0" }
datafusion-common = { path = "../datafusion/common", version = "36.0.0" }
datafusion = { workspace = true, default-features = true }
datafusion-common = { workspace = true, default-features = true }
env_logger = { workspace = true }
futures = { workspace = true }
log = { workspace = true }
Expand All @@ -49,4 +49,4 @@ test-utils = { path = "../test-utils/", version = "0.1.0" }
tokio = { workspace = true, features = ["rt-multi-thread", "parking_lot"] }

[dev-dependencies]
datafusion-proto = { path = "../datafusion/proto", version = "36.0.0" }
datafusion-proto = { workspace = true }
12 changes: 6 additions & 6 deletions datafusion-examples/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ arrow-schema = { workspace = true }
async-trait = { workspace = true }
bytes = { workspace = true }
dashmap = { workspace = true }
datafusion = { path = "../datafusion/core", features = ["avro"] }
datafusion-common = { path = "../datafusion/common" }
datafusion-expr = { path = "../datafusion/expr" }
datafusion-optimizer = { path = "../datafusion/optimizer" }
datafusion-physical-expr = { workspace = true }
datafusion-sql = { path = "../datafusion/sql" }
datafusion = { workspace = true, default-features = true, features = ["avro"] }
datafusion-common = { workspace = true, default-features = true }
datafusion-expr = { workspace = true }
datafusion-optimizer = { workspace = true, default-features = true }
datafusion-physical-expr = { workspace = true, default-features = true }
datafusion-sql = { workspace = true }
env_logger = { workspace = true }
futures = { workspace = true }
log = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions datafusion/common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ arrow-array = { workspace = true }
arrow-buffer = { workspace = true }
arrow-schema = { workspace = true }
chrono = { workspace = true }
half = { version = "2.1", default-features = false }
half = { workspace = true }
libc = "0.2.140"
num_cpus = { workspace = true }
object_store = { workspace = true, optional = true }
Expand All @@ -61,4 +61,4 @@ pyo3 = { version = "0.20.0", optional = true }
sqlparser = { workspace = true }

[dev-dependencies]
rand = "0.8.4"
rand = { workspace = true }
12 changes: 6 additions & 6 deletions datafusion/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,19 +86,19 @@ bytes = { workspace = true }
bzip2 = { version = "0.4.3", optional = true }
chrono = { workspace = true }
dashmap = { workspace = true }
datafusion-common = { path = "../common", version = "36.0.0", features = ["object_store"], default-features = false }
datafusion-common = { workspace = true, features = ["object_store"] }
datafusion-execution = { workspace = true }
datafusion-expr = { workspace = true }
datafusion-functions = { workspace = true }
datafusion-functions-array = { workspace = true, optional = true }
datafusion-optimizer = { path = "../optimizer", version = "36.0.0", default-features = false }
datafusion-physical-expr = { path = "../physical-expr", version = "36.0.0", default-features = false }
datafusion-optimizer = { workspace = true }
datafusion-physical-expr = { workspace = true }
datafusion-physical-plan = { workspace = true }
datafusion-sql = { workspace = true }
flate2 = { version = "1.0.24", optional = true }
futures = { workspace = true }
glob = "0.3.0"
half = { version = "2.1", default-features = false }
half = { workspace = true }
hashbrown = { version = "0.14", features = ["raw"] }
indexmap = { workspace = true }
itertools = { workspace = true }
Expand Down Expand Up @@ -127,10 +127,10 @@ csv = "1.1.6"
ctor = { workspace = true }
doc-comment = { workspace = true }
env_logger = { workspace = true }
half = { workspace = true }
half = { workspace = true, default-features = true }
postgres-protocol = "0.6.4"
postgres-types = { version = "0.2.4", features = ["derive", "with-chrono-0_4"] }
rand = { version = "0.8", features = ["small_rng"] }
rand = { workspace = true, features = ["small_rng"] }
rand_distr = "0.4.3"
regex = "1.5.4"
rstest = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion datafusion/execution/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ path = "src/lib.rs"
arrow = { workspace = true }
chrono = { workspace = true }
dashmap = { workspace = true }
datafusion-common = { workspace = true }
datafusion-common = { workspace = true, default-features = true }
datafusion-expr = { workspace = true }
futures = { workspace = true }
hashbrown = { version = "0.14", features = ["raw"] }
Expand Down
2 changes: 1 addition & 1 deletion datafusion/expr/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ ahash = { version = "0.8", default-features = false, features = [
] }
arrow = { workspace = true }
arrow-array = { workspace = true }
datafusion-common = { workspace = true }
datafusion-common = { workspace = true, default-features = true }
paste = "^1.0"
sqlparser = { workspace = true }
strum = { version = "0.26.1", features = ["derive"] }
Expand Down
4 changes: 2 additions & 2 deletions datafusion/functions-array/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ path = "src/lib.rs"

[dependencies]
arrow = { workspace = true }
datafusion-common = { workspace = true }
datafusion-common = { workspace = true, default-features = true }
datafusion-execution = { workspace = true }
datafusion-expr = { workspace = true }
log = "0.4.20"
log = { workspace = true }
paste = "1.0.14"
4 changes: 2 additions & 2 deletions datafusion/functions/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ path = "src/lib.rs"
[dependencies]
arrow = { workspace = true }
base64 = { version = "0.21", optional = true }
datafusion-common = { workspace = true }
datafusion-common = { workspace = true, default-features = true }
datafusion-execution = { workspace = true }
datafusion-expr = { workspace = true }
hex = { version = "0.4", optional = true }
log = "0.4.20"
log = { workspace = true }
8 changes: 4 additions & 4 deletions datafusion/optimizer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ unicode_expressions = ["datafusion-physical-expr/unicode_expressions"]
arrow = { workspace = true }
async-trait = { workspace = true }
chrono = { workspace = true }
datafusion-common = { workspace = true }
datafusion-common = { workspace = true, default-features = true }
datafusion-expr = { workspace = true }
datafusion-physical-expr = { path = "../physical-expr", version = "36.0.0", default-features = false }
datafusion-physical-expr = { workspace = true }
hashbrown = { version = "0.14", features = ["raw"] }
itertools = { workspace = true }
log = { workspace = true }
regex-syntax = "0.8.0"

[dev-dependencies]
ctor = { workspace = true }
datafusion-sql = { path = "../sql", version = "36.0.0" }
env_logger = "0.11.0"
datafusion-sql = { workspace = true }
env_logger = { workspace = true }
6 changes: 3 additions & 3 deletions datafusion/physical-expr/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@ base64 = { version = "0.21", optional = true }
blake2 = { version = "^0.10.2", optional = true }
blake3 = { version = "1.0", optional = true }
chrono = { workspace = true }
datafusion-common = { workspace = true }
datafusion-common = { workspace = true, default-features = true }
datafusion-execution = { workspace = true }
datafusion-expr = { workspace = true }
half = { version = "2.1", default-features = false }
half = { workspace = true }
hashbrown = { version = "0.14", features = ["raw"] }
hex = { version = "0.4", optional = true }
indexmap = { workspace = true }
itertools = { version = "0.12", features = ["use_std"] }
itertools = { workspace = true, features = ["use_std"] }
log = { workspace = true }
md-5 = { version = "^0.10.0", optional = true }
paste = "^1.0"
Expand Down
8 changes: 4 additions & 4 deletions datafusion/physical-plan/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ arrow-buffer = { workspace = true }
arrow-schema = { workspace = true }
async-trait = { workspace = true }
chrono = { workspace = true }
datafusion-common = { workspace = true }
datafusion-common = { workspace = true, default-features = true }
datafusion-execution = { workspace = true }
datafusion-expr = { workspace = true }
datafusion-physical-expr = { workspace = true }
datafusion-physical-expr = { workspace = true, default-features = true }
futures = { workspace = true }
half = { version = "2.1", default-features = false }
half = { workspace = true }
hashbrown = { version = "0.14", features = ["raw"] }
indexmap = { workspace = true }
itertools = { version = "0.12", features = ["use_std"] }
itertools = { workspace = true, features = ["use_std"] }
log = { workspace = true }
once_cell = "1.18.0"
parking_lot = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions datafusion/proto/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ parquet = ["datafusion/parquet", "datafusion-common/parquet"]
[dependencies]
arrow = { workspace = true }
chrono = { workspace = true }
datafusion = { path = "../core", version = "36.0.0" }
datafusion-common = { workspace = true }
datafusion = { workspace = true, default-features = true }
datafusion-common = { workspace = true, default-features = true }
datafusion-expr = { workspace = true }
object_store = { workspace = true }
pbjson = { version = "0.6.0", optional = true }
Expand Down
8 changes: 4 additions & 4 deletions datafusion/proto/gen/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ description = "Code generation for proto"
version = "0.1.0"
edition = { workspace = true }
rust-version = "1.72"
authors = ["Apache Arrow <dev@arrow.apache.org>"]
homepage = "https://github.com/apache/arrow-datafusion"
repository = "https://github.com/apache/arrow-datafusion"
license = "Apache-2.0"
authors = { workspace = true }
homepage = { workspace = true }
repository = { workspace = true }
license = { workspace = true }
publish = false

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down
4 changes: 2 additions & 2 deletions datafusion/sql/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ unicode_expressions = []
[dependencies]
arrow = { workspace = true }
arrow-schema = { workspace = true }
datafusion-common = { workspace = true }
datafusion-common = { workspace = true, default-features = true }
datafusion-expr = { workspace = true }
log = { workspace = true }
sqlparser = { workspace = true }
Expand All @@ -48,4 +48,4 @@ sqlparser = { workspace = true }
ctor = { workspace = true }
env_logger = { workspace = true }
paste = "^1.0"
rstest = "0.18"
rstest = { workspace = true }
10 changes: 5 additions & 5 deletions datafusion/sqllogictest/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ path = "src/lib.rs"
arrow = { workspace = true }
async-trait = { workspace = true }
bigdecimal = { workspace = true }
bytes = { version = "1.4.0", optional = true }
bytes = { workspace = true, optional = true }
chrono = { workspace = true, optional = true }
clap = { version = "4.4.8", features = ["derive", "env"] }
datafusion = { path = "../core", version = "36.0.0" }
datafusion-common = { workspace = true }
futures = { version = "0.3.28" }
half = { workspace = true }
datafusion = { workspace = true, default-features = true }
datafusion-common = { workspace = true, default-features = true }
futures = { workspace = true }
half = { workspace = true, default-features = true }
itertools = { workspace = true }
log = { workspace = true }
object_store = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion datafusion/substrait/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ rust-version = "1.72"
[dependencies]
async-recursion = "1.0"
chrono = { workspace = true }
datafusion = { workspace = true }
datafusion = { workspace = true, default-features = true }
itertools = { workspace = true }
object_store = { workspace = true }
prost = "0.12"
Expand Down
8 changes: 4 additions & 4 deletions datafusion/wasmtest/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ crate-type = ["cdylib", "rlib"]
# all the `std::fmt` and `std::panicking` infrastructure, so isn't great for
# code size when deploying.
console_error_panic_hook = { version = "0.1.1", optional = true }
datafusion = { path = "../core", default-features = false }
datafusion = { workspace = true }

datafusion-common = { workspace = true }
datafusion-common = { workspace = true, default-features = true }
datafusion-execution = { workspace = true }
datafusion-expr = { workspace = true }
datafusion-optimizer = { workspace = true }
datafusion-physical-expr = { workspace = true }
datafusion-optimizer = { workspace = true, default-features = true }
datafusion-physical-expr = { workspace = true, default-features = true }
datafusion-physical-plan = { workspace = true }
datafusion-sql = { workspace = true }

Expand Down
2 changes: 1 addition & 1 deletion docs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ authors = { workspace = true }
rust-version = { workspace = true }

[dependencies]
datafusion = { path = "../datafusion/core", version = "36.0.0", default-features = false }
datafusion = { workspace = true }
4 changes: 2 additions & 2 deletions test-utils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ edition = { workspace = true }

[dependencies]
arrow = { workspace = true }
datafusion-common = { path = "../datafusion/common" }
env_logger = "0.11.0"
datafusion-common = { workspace = true, default-features = true }
env_logger = { workspace = true }
rand = { workspace = true }
Loading