Skip to content

Commit 8b5c1c7

Browse files
waynexiawaynexia
authored
chore: deduplicate workspace fields in Cargo.toml (#5519)
* 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>
1 parent f4f4d70 commit 8b5c1c7

File tree

16 files changed

+131
-111
lines changed

16 files changed

+131
-111
lines changed

‎Cargo.toml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,22 @@ members = [
3535
"benchmarks",
3636
]
3737

38+
[workspace.package]
39+
version = "19.0.0"
40+
edition = "2021"
41+
readme = "README.md"
42+
authors = ["Apache Arrow <dev@arrow.apache.org>"]
43+
license = "Apache-2.0"
44+
homepage = "https://github.com/apache/arrow-datafusion"
45+
repository = "https://github.com/apache/arrow-datafusion"
46+
rust-version = "1.64"
47+
48+
[workspace.dependencies]
49+
arrow = { version = "34.0.0", features = ["prettyprint"] }
50+
arrow-buffer = "34.0.0"
51+
arrow-schema = "34.0.0"
52+
parquet = { version = "34.0.0", features = ["arrow", "async"] }
53+
3854
[profile.release]
3955
codegen-units = 1
4056
lto = true

‎benchmarks/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ simd = ["datafusion/simd"]
3333
snmalloc = ["snmalloc-rs"]
3434

3535
[dependencies]
36-
arrow = "34.0.0"
36+
arrow = { workspace = true }
3737
datafusion = { path = "../datafusion/core", version = "19.0.0", features = ["scheduler"] }
3838
env_logger = "0.10"
3939
futures = "0.3"
4040
mimalloc = { version = "0.1", optional = true, default-features = false }
4141
num_cpus = "1.13.0"
4242
object_store = "0.5.4"
43-
parquet = "34.0.0"
43+
parquet = { workspace = true }
4444
parquet-test-utils = { path = "../parquet-test-utils/", version = "0.1.0" }
4545
rand = "0.8.4"
4646
serde = { version = "1.0.136", features = ["derive"] }

‎datafusion-examples/Cargo.toml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,26 @@
1818
[package]
1919
name = "datafusion-examples"
2020
description = "DataFusion usage examples"
21-
version = "19.0.0"
22-
homepage = "https://github.com/apache/arrow-datafusion"
23-
repository = "https://github.com/apache/arrow-datafusion"
24-
authors = ["Apache Arrow <dev@arrow.apache.org>"]
25-
license = "Apache-2.0"
2621
keywords = [ "arrow", "query", "sql" ]
27-
edition = "2021"
2822
publish = false
29-
rust-version = "1.62"
23+
version = { workspace = true }
24+
edition = { workspace = true }
25+
readme = { workspace = true }
26+
homepage = { workspace = true }
27+
repository = { workspace = true }
28+
license = { workspace = true }
29+
authors = { workspace = true }
30+
rust-version = { workspace = true }
3031

3132
[[example]]
3233
name = "avro_sql"
3334
path = "examples/avro_sql.rs"
3435
required-features = ["datafusion/avro"]
3536

3637
[dev-dependencies]
37-
arrow = "34.0.0"
38+
arrow = { workspace = true }
3839
arrow-flight = { version = "34.0.0", features = ["flight-sql-experimental"] }
39-
arrow-schema = "34.0.0"
40+
arrow-schema = { workspace = true }
4041
async-trait = "0.1.41"
4142
dashmap = "5.4"
4243
datafusion = { path = "../datafusion/core" }

‎datafusion/common/Cargo.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
[package]
1919
name = "datafusion-common"
2020
description = "Common functionality for DataFusion query engine"
21-
version = "19.0.0"
22-
homepage = "https://github.com/apache/arrow-datafusion"
23-
repository = "https://github.com/apache/arrow-datafusion"
24-
readme = "README.md"
25-
authors = ["Apache Arrow <dev@arrow.apache.org>"]
26-
license = "Apache-2.0"
2721
keywords = ["arrow", "query", "sql"]
28-
edition = "2021"
29-
rust-version = "1.62"
22+
version = { workspace = true }
23+
edition = { workspace = true }
24+
readme = { workspace = true }
25+
homepage = { workspace = true }
26+
repository = { workspace = true }
27+
license = { workspace = true }
28+
authors = { workspace = true }
29+
rust-version = { workspace = true }
3030

3131
[lib]
3232
name = "datafusion_common"
@@ -40,11 +40,11 @@ pyarrow = ["pyo3", "arrow/pyarrow"]
4040

4141
[dependencies]
4242
apache-avro = { version = "0.14", default-features = false, features = ["snappy"], optional = true }
43-
arrow = { version = "34.0.0", default-features = false }
43+
arrow = { workspace = true, default-features = false }
4444
chrono = { version = "0.4", default-features = false }
4545
cranelift-module = { version = "0.92.0", optional = true }
4646
num_cpus = "1.13.0"
4747
object_store = { version = "0.5.4", default-features = false, optional = true }
48-
parquet = { version = "34.0.0", default-features = false, optional = true }
48+
parquet = { workspace = true, default-features = false, optional = true }
4949
pyo3 = { version = "0.18.0", optional = true }
5050
sqlparser = "0.32"

‎datafusion/core/Cargo.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,20 @@
1818
[package]
1919
name = "datafusion"
2020
description = "DataFusion is an in-memory query engine that uses Apache Arrow as the memory model"
21-
version = "19.0.0"
22-
homepage = "https://github.com/apache/arrow-datafusion"
23-
repository = "https://github.com/apache/arrow-datafusion"
24-
readme = "../../README.md"
25-
authors = ["Apache Arrow <dev@arrow.apache.org>"]
26-
license = "Apache-2.0"
2721
keywords = ["arrow", "query", "sql"]
2822
include = [
2923
"benches/*.rs",
3024
"src/**/*.rs",
3125
"Cargo.toml",
3226
]
33-
edition = "2021"
34-
rust-version = "1.62"
27+
version = { workspace = true }
28+
edition = { workspace = true }
29+
readme = { workspace = true }
30+
homepage = { workspace = true }
31+
repository = { workspace = true }
32+
license = { workspace = true }
33+
authors = { workspace = true }
34+
rust-version = { workspace = true }
3535

3636
[lib]
3737
name = "datafusion"
@@ -60,7 +60,7 @@ unicode_expressions = ["datafusion-physical-expr/unicode_expressions", "datafusi
6060
[dependencies]
6161
ahash = { version = "0.8", default-features = false, features = ["runtime-rng"] }
6262
apache-avro = { version = "0.14", optional = true }
63-
arrow = { version = "34.0.0", features = ["prettyprint"] }
63+
arrow = { workspace = true }
6464
async-compression = { version = "0.3.14", features = ["bzip2", "gzip", "xz", "zstd", "futures-io", "tokio"], optional = true }
6565
async-trait = "0.1.41"
6666
bytes = "1.4"
@@ -87,7 +87,7 @@ num-traits = { version = "0.2", optional = true }
8787
num_cpus = "1.13.0"
8888
object_store = "0.5.4"
8989
parking_lot = "0.12"
90-
parquet = { version = "34.0.0", features = ["arrow", "async"] }
90+
parquet = { workspace = true }
9191
paste = "^1.0"
9292
percent-encoding = "2.2.0"
9393
pin-project-lite = "^0.2.7"

‎datafusion/execution/Cargo.toml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,20 @@
1818
[package]
1919
name = "datafusion-execution"
2020
description = "Execution configuration support for DataFusion query engine"
21-
version = "19.0.0"
22-
homepage = "https://github.com/apache/arrow-datafusion"
23-
repository = "https://github.com/apache/arrow-datafusion"
24-
readme = "README.md"
25-
authors = ["Apache Arrow <dev@arrow.apache.org>"]
26-
license = "Apache-2.0"
2721
keywords = [ "arrow", "query", "sql" ]
28-
edition = "2021"
29-
rust-version = "1.62"
22+
version = { workspace = true }
23+
edition = { workspace = true }
24+
readme = { workspace = true }
25+
homepage = { workspace = true }
26+
repository = { workspace = true }
27+
license = { workspace = true }
28+
authors = { workspace = true }
29+
rust-version = { workspace = true }
3030

3131
[lib]
3232
name = "datafusion_execution"
3333
path = "src/lib.rs"
3434

35-
3635
[dependencies]
3736
dashmap = "5.4.0"
3837
datafusion-common = { path = "../common", version = "19.0.0" }

‎datafusion/expr/Cargo.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
[package]
1919
name = "datafusion-expr"
2020
description = "Logical plan and expression representation for DataFusion query engine"
21-
version = "19.0.0"
22-
homepage = "https://github.com/apache/arrow-datafusion"
23-
repository = "https://github.com/apache/arrow-datafusion"
24-
readme = "README.md"
25-
authors = ["Apache Arrow <dev@arrow.apache.org>"]
26-
license = "Apache-2.0"
2721
keywords = [ "datafusion", "logical", "plan", "expressions" ]
28-
edition = "2021"
29-
rust-version = "1.62"
22+
version = { workspace = true }
23+
edition = { workspace = true }
24+
readme = { workspace = true }
25+
homepage = { workspace = true }
26+
repository = { workspace = true }
27+
license = { workspace = true }
28+
authors = { workspace = true }
29+
rust-version = { workspace = true }
3030

3131
[lib]
3232
name = "datafusion_expr"
@@ -36,7 +36,7 @@ path = "src/lib.rs"
3636

3737
[dependencies]
3838
ahash = { version = "0.8", default-features = false, features = ["runtime-rng"] }
39-
arrow = { version = "34.0.0", default-features = false }
39+
arrow = { workspace = true, default-features = false }
4040
datafusion-common = { path = "../common", version = "19.0.0" }
4141
log = "^0.4"
4242
sqlparser = "0.32"

‎datafusion/jit/Cargo.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
[package]
1919
name = "datafusion-jit"
2020
description = "Just In Time (JIT) compilation support for DataFusion query engine"
21-
version = "19.0.0"
22-
homepage = "https://github.com/apache/arrow-datafusion"
23-
repository = "https://github.com/apache/arrow-datafusion"
24-
readme = "README.md"
25-
authors = ["Apache Arrow <dev@arrow.apache.org>"]
26-
license = "Apache-2.0"
2721
keywords = [ "arrow", "query", "sql" ]
28-
edition = "2021"
29-
rust-version = "1.62"
22+
version = { workspace = true }
23+
edition = { workspace = true }
24+
readme = { workspace = true }
25+
homepage = { workspace = true }
26+
repository = { workspace = true }
27+
license = { workspace = true }
28+
authors = { workspace = true }
29+
rust-version = { workspace = true }
3030

3131
[lib]
3232
name = "datafusion_jit"
@@ -36,7 +36,7 @@ path = "src/lib.rs"
3636
jit = []
3737

3838
[dependencies]
39-
arrow = { version = "34.0.0", default-features = false }
39+
arrow = { workspace = true, default-features = false }
4040
cranelift = "0.89.0"
4141
cranelift-jit = "0.89.0"
4242
cranelift-module = "0.89.0"

‎datafusion/optimizer/Cargo.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
[package]
1919
name = "datafusion-optimizer"
2020
description = "DataFusion Query Optimizer"
21-
version = "19.0.0"
22-
homepage = "https://github.com/apache/arrow-datafusion"
23-
repository = "https://github.com/apache/arrow-datafusion"
24-
readme = "README.md"
25-
authors = ["Apache Arrow <dev@arrow.apache.org>"]
26-
license = "Apache-2.0"
2721
keywords = [ "datafusion", "query", "optimizer" ]
28-
edition = "2021"
29-
rust-version = "1.62"
22+
version = { workspace = true }
23+
edition = { workspace = true }
24+
readme = { workspace = true }
25+
homepage = { workspace = true }
26+
repository = { workspace = true }
27+
license = { workspace = true }
28+
authors = { workspace = true }
29+
rust-version = { workspace = true }
3030

3131
[lib]
3232
name = "datafusion_optimizer"
@@ -40,7 +40,7 @@ regex_expressions = ["datafusion-physical-expr/regex_expressions"]
4040
unicode_expressions = ["datafusion-physical-expr/unicode_expressions"]
4141

4242
[dependencies]
43-
arrow = { version = "34.0.0", features = ["prettyprint"] }
43+
arrow = { workspace = true }
4444
async-trait = "0.1.41"
4545
chrono = { version = "0.4.23", default-features = false }
4646
datafusion-common = { path = "../common", version = "19.0.0" }

‎datafusion/physical-expr/Cargo.toml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
[package]
1919
name = "datafusion-physical-expr"
2020
description = "Physical expression implementation for DataFusion query engine"
21-
version = "19.0.0"
22-
homepage = "https://github.com/apache/arrow-datafusion"
23-
repository = "https://github.com/apache/arrow-datafusion"
24-
readme = "README.md"
25-
authors = ["Apache Arrow <dev@arrow.apache.org>"]
26-
license = "Apache-2.0"
2721
keywords = ["arrow", "query", "sql"]
28-
edition = "2021"
29-
rust-version = "1.62"
22+
version = { workspace = true }
23+
edition = { workspace = true }
24+
readme = { workspace = true }
25+
homepage = { workspace = true }
26+
repository = { workspace = true }
27+
license = { workspace = true }
28+
authors = { workspace = true }
29+
rust-version = { workspace = true }
3030

3131
[lib]
3232
name = "datafusion_physical_expr"
@@ -43,9 +43,9 @@ unicode_expressions = ["unicode-segmentation"]
4343

4444
[dependencies]
4545
ahash = { version = "0.8", default-features = false, features = ["runtime-rng"] }
46-
arrow = { version = "34.0.0", features = ["prettyprint"] }
47-
arrow-buffer = "34.0.0"
48-
arrow-schema = "34.0.0"
46+
arrow = { workspace = true }
47+
arrow-buffer = { workspace = true }
48+
arrow-schema = { workspace = true }
4949
blake2 = { version = "^0.10.2", optional = true }
5050
blake3 = { version = "1.0", optional = true }
5151
chrono = { version = "0.4.23", default-features = false }

0 commit comments

Comments
 (0)