Skip to content

Commit

Permalink
chore: deduplicate workspace fields in Cargo.toml (#5519)
Browse files Browse the repository at this point in the history 
* chore: deduplicate workspace fields in Cargo.toml

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>

* workspace dependencies

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>

* fix toml style

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>

---------

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>
  • Loading branch information
@waynexia
waynexia authored Mar 10, 2023
1 parent f4f4d70 commit 8b5c1c7
Show file tree
Hide file tree
Showing 16 changed files with 131 additions and 111 deletions.
16 changes: 16 additions & 0 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,22 @@ members = [
"benchmarks",
]

[workspace.package]
version = "19.0.0"
edition = "2021"
readme = "README.md"
authors = ["Apache Arrow <dev@arrow.apache.org>"]
license = "Apache-2.0"
homepage = "https://github.com/apache/arrow-datafusion"
repository = "https://github.com/apache/arrow-datafusion"
rust-version = "1.64"

[workspace.dependencies]
arrow = { version = "34.0.0", features = ["prettyprint"] }
arrow-buffer = "34.0.0"
arrow-schema = "34.0.0"
parquet = { version = "34.0.0", features = ["arrow", "async"] }

[profile.release]
codegen-units = 1
lto = true
Expand Down
4 changes: 2 additions & 2 deletions benchmarks/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ simd = ["datafusion/simd"]
snmalloc = ["snmalloc-rs"]

[dependencies]
arrow = "34.0.0"
arrow = { workspace = true }
datafusion = { path = "../datafusion/core", version = "19.0.0", features = ["scheduler"] }
env_logger = "0.10"
futures = "0.3"
mimalloc = { version = "0.1", optional = true, default-features = false }
num_cpus = "1.13.0"
object_store = "0.5.4"
parquet = "34.0.0"
parquet = { workspace = true }
parquet-test-utils = { path = "../parquet-test-utils/", version = "0.1.0" }
rand = "0.8.4"
serde = { version = "1.0.136", features = ["derive"] }
Expand Down
19 changes: 10 additions & 9 deletions datafusion-examples/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,26 @@
[package]
name = "datafusion-examples"
description = "DataFusion usage examples"
version = "19.0.0"
homepage = "https://github.com/apache/arrow-datafusion"
repository = "https://github.com/apache/arrow-datafusion"
authors = ["Apache Arrow <dev@arrow.apache.org>"]
license = "Apache-2.0"
keywords = [ "arrow", "query", "sql" ]
edition = "2021"
publish = false
rust-version = "1.62"
version = { workspace = true }
edition = { workspace = true }
readme = { workspace = true }
homepage = { workspace = true }
repository = { workspace = true }
license = { workspace = true }
authors = { workspace = true }
rust-version = { workspace = true }

[[example]]
name = "avro_sql"
path = "examples/avro_sql.rs"
required-features = ["datafusion/avro"]

[dev-dependencies]
arrow = "34.0.0"
arrow = { workspace = true }
arrow-flight = { version = "34.0.0", features = ["flight-sql-experimental"] }
arrow-schema = "34.0.0"
arrow-schema = { workspace = true }
async-trait = "0.1.41"
dashmap = "5.4"
datafusion = { path = "../datafusion/core" }
Expand Down
20 changes: 10 additions & 10 deletions datafusion/common/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
[package]
name = "datafusion-common"
description = "Common functionality for DataFusion query engine"
version = "19.0.0"
homepage = "https://github.com/apache/arrow-datafusion"
repository = "https://github.com/apache/arrow-datafusion"
readme = "README.md"
authors = ["Apache Arrow <dev@arrow.apache.org>"]
license = "Apache-2.0"
keywords = ["arrow", "query", "sql"]
edition = "2021"
rust-version = "1.62"
version = { workspace = true }
edition = { workspace = true }
readme = { workspace = true }
homepage = { workspace = true }
repository = { workspace = true }
license = { workspace = true }
authors = { workspace = true }
rust-version = { workspace = true }

[lib]
name = "datafusion_common"
Expand All @@ -40,11 +40,11 @@ pyarrow = ["pyo3", "arrow/pyarrow"]

[dependencies]
apache-avro = { version = "0.14", default-features = false, features = ["snappy"], optional = true }
arrow = { version = "34.0.0", default-features = false }
arrow = { workspace = true, default-features = false }
chrono = { version = "0.4", default-features = false }
cranelift-module = { version = "0.92.0", optional = true }
num_cpus = "1.13.0"
object_store = { version = "0.5.4", default-features = false, optional = true }
parquet = { version = "34.0.0", default-features = false, optional = true }
parquet = { workspace = true, default-features = false, optional = true }
pyo3 = { version = "0.18.0", optional = true }
sqlparser = "0.32"
20 changes: 10 additions & 10 deletions datafusion/core/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,20 @@
[package]
name = "datafusion"
description = "DataFusion is an in-memory query engine that uses Apache Arrow as the memory model"
version = "19.0.0"
homepage = "https://github.com/apache/arrow-datafusion"
repository = "https://github.com/apache/arrow-datafusion"
readme = "../../README.md"
authors = ["Apache Arrow <dev@arrow.apache.org>"]
license = "Apache-2.0"
keywords = ["arrow", "query", "sql"]
include = [
"benches/*.rs",
"src/**/*.rs",
"Cargo.toml",
]
edition = "2021"
rust-version = "1.62"
version = { workspace = true }
edition = { workspace = true }
readme = { workspace = true }
homepage = { workspace = true }
repository = { workspace = true }
license = { workspace = true }
authors = { workspace = true }
rust-version = { workspace = true }

[lib]
name = "datafusion"
Expand Down Expand Up @@ -60,7 +60,7 @@ unicode_expressions = ["datafusion-physical-expr/unicode_expressions", "datafusi
[dependencies]
ahash = { version = "0.8", default-features = false, features = ["runtime-rng"] }
apache-avro = { version = "0.14", optional = true }
arrow = { version = "34.0.0", features = ["prettyprint"] }
arrow = { workspace = true }
async-compression = { version = "0.3.14", features = ["bzip2", "gzip", "xz", "zstd", "futures-io", "tokio"], optional = true }
async-trait = "0.1.41"
bytes = "1.4"
Expand All @@ -87,7 +87,7 @@ num-traits = { version = "0.2", optional = true }
num_cpus = "1.13.0"
object_store = "0.5.4"
parking_lot = "0.12"
parquet = { version = "34.0.0", features = ["arrow", "async"] }
parquet = { workspace = true }
paste = "^1.0"
percent-encoding = "2.2.0"
pin-project-lite = "^0.2.7"
Expand Down
17 changes: 8 additions & 9 deletions datafusion/execution/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,20 @@
[package]
name = "datafusion-execution"
description = "Execution configuration support for DataFusion query engine"
version = "19.0.0"
homepage = "https://github.com/apache/arrow-datafusion"
repository = "https://github.com/apache/arrow-datafusion"
readme = "README.md"
authors = ["Apache Arrow <dev@arrow.apache.org>"]
license = "Apache-2.0"
keywords = [ "arrow", "query", "sql" ]
edition = "2021"
rust-version = "1.62"
version = { workspace = true }
edition = { workspace = true }
readme = { workspace = true }
homepage = { workspace = true }
repository = { workspace = true }
license = { workspace = true }
authors = { workspace = true }
rust-version = { workspace = true }

[lib]
name = "datafusion_execution"
path = "src/lib.rs"


[dependencies]
dashmap = "5.4.0"
datafusion-common = { path = "../common", version = "19.0.0" }
Expand Down
18 changes: 9 additions & 9 deletions datafusion/expr/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
[package]
name = "datafusion-expr"
description = "Logical plan and expression representation for DataFusion query engine"
version = "19.0.0"
homepage = "https://github.com/apache/arrow-datafusion"
repository = "https://github.com/apache/arrow-datafusion"
readme = "README.md"
authors = ["Apache Arrow <dev@arrow.apache.org>"]
license = "Apache-2.0"
keywords = [ "datafusion", "logical", "plan", "expressions" ]
edition = "2021"
rust-version = "1.62"
version = { workspace = true }
edition = { workspace = true }
readme = { workspace = true }
homepage = { workspace = true }
repository = { workspace = true }
license = { workspace = true }
authors = { workspace = true }
rust-version = { workspace = true }

[lib]
name = "datafusion_expr"
Expand All @@ -36,7 +36,7 @@ path = "src/lib.rs"

[dependencies]
ahash = { version = "0.8", default-features = false, features = ["runtime-rng"] }
arrow = { version = "34.0.0", default-features = false }
arrow = { workspace = true, default-features = false }
datafusion-common = { path = "../common", version = "19.0.0" }
log = "^0.4"
sqlparser = "0.32"
Expand Down
18 changes: 9 additions & 9 deletions datafusion/jit/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
[package]
name = "datafusion-jit"
description = "Just In Time (JIT) compilation support for DataFusion query engine"
version = "19.0.0"
homepage = "https://github.com/apache/arrow-datafusion"
repository = "https://github.com/apache/arrow-datafusion"
readme = "README.md"
authors = ["Apache Arrow <dev@arrow.apache.org>"]
license = "Apache-2.0"
keywords = [ "arrow", "query", "sql" ]
edition = "2021"
rust-version = "1.62"
version = { workspace = true }
edition = { workspace = true }
readme = { workspace = true }
homepage = { workspace = true }
repository = { workspace = true }
license = { workspace = true }
authors = { workspace = true }
rust-version = { workspace = true }

[lib]
name = "datafusion_jit"
Expand All @@ -36,7 +36,7 @@ path = "src/lib.rs"
jit = []

[dependencies]
arrow = { version = "34.0.0", default-features = false }
arrow = { workspace = true, default-features = false }
cranelift = "0.89.0"
cranelift-jit = "0.89.0"
cranelift-module = "0.89.0"
Expand Down
18 changes: 9 additions & 9 deletions datafusion/optimizer/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
[package]
name = "datafusion-optimizer"
description = "DataFusion Query Optimizer"
version = "19.0.0"
homepage = "https://github.com/apache/arrow-datafusion"
repository = "https://github.com/apache/arrow-datafusion"
readme = "README.md"
authors = ["Apache Arrow <dev@arrow.apache.org>"]
license = "Apache-2.0"
keywords = [ "datafusion", "query", "optimizer" ]
edition = "2021"
rust-version = "1.62"
version = { workspace = true }
edition = { workspace = true }
readme = { workspace = true }
homepage = { workspace = true }
repository = { workspace = true }
license = { workspace = true }
authors = { workspace = true }
rust-version = { workspace = true }

[lib]
name = "datafusion_optimizer"
Expand All @@ -40,7 +40,7 @@ regex_expressions = ["datafusion-physical-expr/regex_expressions"]
unicode_expressions = ["datafusion-physical-expr/unicode_expressions"]

[dependencies]
arrow = { version = "34.0.0", features = ["prettyprint"] }
arrow = { workspace = true }
async-trait = "0.1.41"
chrono = { version = "0.4.23", default-features = false }
datafusion-common = { path = "../common", version = "19.0.0" }
Expand Down
22 changes: 11 additions & 11 deletions datafusion/physical-expr/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
[package]
name = "datafusion-physical-expr"
description = "Physical expression implementation for DataFusion query engine"
version = "19.0.0"
homepage = "https://github.com/apache/arrow-datafusion"
repository = "https://github.com/apache/arrow-datafusion"
readme = "README.md"
authors = ["Apache Arrow <dev@arrow.apache.org>"]
license = "Apache-2.0"
keywords = ["arrow", "query", "sql"]
edition = "2021"
rust-version = "1.62"
version = { workspace = true }
edition = { workspace = true }
readme = { workspace = true }
homepage = { workspace = true }
repository = { workspace = true }
license = { workspace = true }
authors = { workspace = true }
rust-version = { workspace = true }

[lib]
name = "datafusion_physical_expr"
Expand All @@ -43,9 +43,9 @@ unicode_expressions = ["unicode-segmentation"]

[dependencies]
ahash = { version = "0.8", default-features = false, features = ["runtime-rng"] }
arrow = { version = "34.0.0", features = ["prettyprint"] }
arrow-buffer = "34.0.0"
arrow-schema = "34.0.0"
arrow = { workspace = true }
arrow-buffer = { workspace = true }
arrow-schema = { workspace = true }
blake2 = { version = "^0.10.2", optional = true }
blake3 = { version = "1.0", optional = true }
chrono = { version = "0.4.23", default-features = false }
Expand Down
18 changes: 9 additions & 9 deletions datafusion/proto/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
[package]
name = "datafusion-proto"
description = "Protobuf serialization of DataFusion logical plan expressions"
version = "19.0.0"
homepage = "https://github.com/apache/arrow-datafusion"
repository = "https://github.com/apache/arrow-datafusion"
readme = "README.md"
authors = ["Apache Arrow <dev@arrow.apache.org>"]
license = "Apache-2.0"
keywords = ["arrow", "query", "sql"]
edition = "2021"
rust-version = "1.62"
version = { workspace = true }
edition = { workspace = true }
readme = { workspace = true }
homepage = { workspace = true }
repository = { workspace = true }
license = { workspace = true }
authors = { workspace = true }
rust-version = { workspace = true }

# Exclude proto files so crates.io consumers don't need protoc
exclude = ["*.proto"]
Expand All @@ -40,7 +40,7 @@ default = []
json = ["pbjson", "serde", "serde_json"]

[dependencies]
arrow = "34.0.0"
arrow = { workspace = true }
chrono = { version = "0.4", default-features = false }
datafusion = { path = "../core", version = "19.0.0" }
datafusion-common = { path = "../common", version = "19.0.0" }
Expand Down
18 changes: 9 additions & 9 deletions datafusion/row/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
[package]
name = "datafusion-row"
description = "Row backed by raw bytes for DataFusion query engine"
version = "19.0.0"
homepage = "https://github.com/apache/arrow-datafusion"
repository = "https://github.com/apache/arrow-datafusion"
readme = "README.md"
authors = ["Apache Arrow <dev@arrow.apache.org>"]
license = "Apache-2.0"
keywords = [ "arrow", "query", "sql" ]
edition = "2021"
rust-version = "1.62"
version = { workspace = true }
edition = { workspace = true }
readme = { workspace = true }
homepage = { workspace = true }
repository = { workspace = true }
license = { workspace = true }
authors = { workspace = true }
rust-version = { workspace = true }

[lib]
name = "datafusion_row"
Expand All @@ -37,7 +37,7 @@ path = "src/lib.rs"
jit = ["datafusion-jit"]

[dependencies]
arrow = "34.0.0"
arrow = { workspace = true }
datafusion-common = { path = "../common", version = "19.0.0" }
datafusion-jit = { path = "../jit", version = "19.0.0", optional = true }
paste = "^1.0"
Expand Down
Loading

0 comments on commit 8b5c1c7

Please sign in to comment.