This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion.git
The following commit(s) were added to refs/heads/main by this push:
new 0366f0ef58 chore: unify common dependencies as workspace dependencies
(#18665)
0366f0ef58 is described below
commit 0366f0ef580fc48a4187a0472d249e7b8b91e786
Author: Jeffrey Vo <[email protected]>
AuthorDate: Wed Nov 26 18:29:18 2025 +1100
chore: unify common dependencies as workspace dependencies (#18665)
## Which issue does this PR close?
<!--
We generally require a GitHub issue to be filed for all bug fixes and
enhancements and this helps us generate change logs for our releases.
You can link an issue to this PR using the GitHub syntax. For example
`Closes #123` indicates that this PR will close issue #123.
-->
N/A
## Rationale for this change
<!--
Why are you proposing this change? If this is already explained clearly
in the issue then this section is not needed.
Explaining clearly why changes are proposed helps reviewers understand
your changes and offer better suggestions for fixes.
-->
Unify dependencies to workspace toml so we have single version for
common dependencies.
## What changes are included in this PR?
<!--
There is no need to duplicate the description in the issue here but it
is sometimes worth providing a summary of the individual changes in this
PR.
-->
Move some repeated dependencies across crates to workspace dependencies.
## Are these changes tested?
<!--
We typically require tests for all PRs in order to:
1. Prevent the code from being accidentally broken by subsequent changes
2. Serve as another way to document the expected behavior of the code
If tests are not included in your PR, please explain why (for example,
are they covered by existing tests)?
-->
Existing tests.
## Are there any user-facing changes?
<!--
If there are user-facing changes then we may require documentation to be
updated before approving the PR.
-->
No.
<!--
If there are any breaking changes to public APIs, please add the `api
change` label.
-->
---------
Co-authored-by: Andrew Lamb <[email protected]>
---
Cargo.toml | 5 +++++
datafusion/common/Cargo.toml | 2 +-
datafusion/core/Cargo.toml | 10 +++++-----
datafusion/datasource/Cargo.toml | 8 ++++----
datafusion/expr-common/Cargo.toml | 2 +-
datafusion/expr/Cargo.toml | 2 +-
datafusion/functions-aggregate/Cargo.toml | 2 +-
datafusion/functions-nested/Cargo.toml | 2 +-
datafusion/functions-table/Cargo.toml | 2 +-
datafusion/functions-window/Cargo.toml | 2 +-
datafusion/functions/Cargo.toml | 2 +-
datafusion/physical-expr/Cargo.toml | 2 +-
datafusion/sql/Cargo.toml | 2 +-
datafusion/substrait/Cargo.toml | 2 +-
14 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index 7692873dcf..bcc665e763 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -107,6 +107,7 @@ arrow-schema = { version = "57.0.0", default-features =
false }
async-trait = "0.1.89"
bigdecimal = "0.4.8"
bytes = "1.11"
+bzip2 = "0.6.1"
chrono = { version = "0.4.42", default-features = false }
criterion = "0.7"
ctor = "0.6.1"
@@ -151,7 +152,9 @@ datafusion-substrait = { path = "datafusion/substrait",
version = "51.0.0" }
doc-comment = "0.3"
env_logger = "0.11"
+flate2 = "1.1.5"
futures = "0.3"
+glob = "0.3.0"
half = { version = "2.7.0", default-features = false }
hashbrown = { version = "0.14.5", features = ["raw"] }
hex = { version = "0.4.3" }
@@ -168,6 +171,7 @@ parquet = { version = "57.0.0", default-features = false,
features = [
"async",
"object_store",
] }
+paste = "1.0.15"
pbjson = { version = "0.8.0" }
pbjson-types = "0.8"
# Should match arrow-flight's version of prost.
@@ -183,6 +187,7 @@ testcontainers = { version = "0.25.2", features =
["default"] }
testcontainers-modules = { version = "0.13" }
tokio = { version = "1.48", features = ["macros", "rt", "sync"] }
url = "2.5.7"
+zstd = { version = "0.13", default-features = false }
[workspace.lints.clippy]
# Detects large stack-allocated futures that may cause stack overflow crashes
(see threshold in clippy.toml)
diff --git a/datafusion/common/Cargo.toml b/datafusion/common/Cargo.toml
index 4a96c34bf8..5c36e33c72 100644
--- a/datafusion/common/Cargo.toml
+++ b/datafusion/common/Cargo.toml
@@ -72,7 +72,7 @@ libc = "0.2.177"
log = { workspace = true }
object_store = { workspace = true, optional = true }
parquet = { workspace = true, optional = true, default-features = true }
-paste = "1.0.15"
+paste = { workspace = true }
recursive = { workspace = true, optional = true }
sqlparser = { workspace = true, optional = true }
tokio = { workspace = true }
diff --git a/datafusion/core/Cargo.toml b/datafusion/core/Cargo.toml
index 58ad4874f8..d76cae9695 100644
--- a/datafusion/core/Cargo.toml
+++ b/datafusion/core/Cargo.toml
@@ -114,7 +114,7 @@ arrow = { workspace = true }
arrow-schema = { workspace = true, features = ["canonical_extension_types"] }
async-trait = { workspace = true }
bytes = { workspace = true }
-bzip2 = { version = "0.6.1", optional = true }
+bzip2 = { workspace = true, optional = true }
chrono = { workspace = true }
datafusion-catalog = { workspace = true }
datafusion-catalog-listing = { workspace = true }
@@ -142,7 +142,7 @@ datafusion-physical-optimizer = { workspace = true }
datafusion-physical-plan = { workspace = true }
datafusion-session = { workspace = true }
datafusion-sql = { workspace = true, optional = true }
-flate2 = { version = "1.1.5", optional = true }
+flate2 = { workspace = true, optional = true }
futures = { workspace = true }
itertools = { workspace = true }
liblzma = { workspace = true, optional = true }
@@ -159,7 +159,7 @@ tempfile = { workspace = true }
tokio = { workspace = true }
url = { workspace = true }
uuid = { version = "1.18", features = ["v4", "js"] }
-zstd = { version = "0.13", optional = true, default-features = false }
+zstd = { workspace = true, optional = true }
[dev-dependencies]
async-trait = { workspace = true }
@@ -172,9 +172,9 @@ datafusion-macros = { workspace = true }
datafusion-physical-optimizer = { workspace = true }
doc-comment = { workspace = true }
env_logger = { workspace = true }
-glob = { version = "0.3.0" }
+glob = { workspace = true }
insta = { workspace = true }
-paste = "^1.0"
+paste = { workspace = true }
rand = { workspace = true, features = ["small_rng"] }
rand_distr = "0.5"
regex = { workspace = true }
diff --git a/datafusion/datasource/Cargo.toml b/datafusion/datasource/Cargo.toml
index 1c36114f28..28aa2c59ed 100644
--- a/datafusion/datasource/Cargo.toml
+++ b/datafusion/datasource/Cargo.toml
@@ -45,7 +45,7 @@ async-compression = { version = "0.4.30", features = [
], optional = true }
async-trait = { workspace = true }
bytes = { workspace = true }
-bzip2 = { version = "0.6.1", optional = true }
+bzip2 = { workspace = true, optional = true }
chrono = { workspace = true }
datafusion-common = { workspace = true, features = ["object_store"] }
datafusion-common-runtime = { workspace = true }
@@ -56,9 +56,9 @@ datafusion-physical-expr-adapter = { workspace = true }
datafusion-physical-expr-common = { workspace = true }
datafusion-physical-plan = { workspace = true }
datafusion-session = { workspace = true }
-flate2 = { version = "1.1.5", optional = true }
+flate2 = { workspace = true, optional = true }
futures = { workspace = true }
-glob = "0.3.0"
+glob = { workspace = true }
itertools = { workspace = true }
liblzma = { workspace = true, optional = true }
log = { workspace = true }
@@ -68,7 +68,7 @@ tempfile = { workspace = true, optional = true }
tokio = { workspace = true }
tokio-util = { version = "0.7.17", features = ["io"], optional = true }
url = { workspace = true }
-zstd = { version = "0.13", optional = true, default-features = false }
+zstd = { workspace = true, optional = true }
[dev-dependencies]
criterion = { workspace = true }
diff --git a/datafusion/expr-common/Cargo.toml
b/datafusion/expr-common/Cargo.toml
index 0c4fa2c211..5ee46b454e 100644
--- a/datafusion/expr-common/Cargo.toml
+++ b/datafusion/expr-common/Cargo.toml
@@ -45,4 +45,4 @@ arrow = { workspace = true }
datafusion-common = { workspace = true }
indexmap = { workspace = true }
itertools = { workspace = true }
-paste = "^1.0"
+paste = { workspace = true }
diff --git a/datafusion/expr/Cargo.toml b/datafusion/expr/Cargo.toml
index 11d6ca1533..75aa59595b 100644
--- a/datafusion/expr/Cargo.toml
+++ b/datafusion/expr/Cargo.toml
@@ -57,7 +57,7 @@ datafusion-functions-window-common = { workspace = true }
datafusion-physical-expr-common = { workspace = true }
indexmap = { workspace = true }
itertools = { workspace = true }
-paste = "^1.0"
+paste = { workspace = true }
recursive = { workspace = true, optional = true }
serde_json = { workspace = true }
sqlparser = { workspace = true, optional = true }
diff --git a/datafusion/functions-aggregate/Cargo.toml
b/datafusion/functions-aggregate/Cargo.toml
index 428855a616..8f8697fef0 100644
--- a/datafusion/functions-aggregate/Cargo.toml
+++ b/datafusion/functions-aggregate/Cargo.toml
@@ -53,7 +53,7 @@ datafusion-physical-expr = { workspace = true }
datafusion-physical-expr-common = { workspace = true }
half = { workspace = true }
log = { workspace = true }
-paste = "1.0.14"
+paste = { workspace = true }
[dev-dependencies]
arrow = { workspace = true, features = ["test_utils"] }
diff --git a/datafusion/functions-nested/Cargo.toml
b/datafusion/functions-nested/Cargo.toml
index 6d8e3c4497..6b0241a10a 100644
--- a/datafusion/functions-nested/Cargo.toml
+++ b/datafusion/functions-nested/Cargo.toml
@@ -59,7 +59,7 @@ datafusion-macros = { workspace = true }
datafusion-physical-expr-common = { workspace = true }
itertools = { workspace = true, features = ["use_std"] }
log = { workspace = true }
-paste = "1.0.14"
+paste = { workspace = true }
[dev-dependencies]
criterion = { workspace = true, features = ["async_tokio"] }
diff --git a/datafusion/functions-table/Cargo.toml
b/datafusion/functions-table/Cargo.toml
index a5f50c072d..aa401fbd7d 100644
--- a/datafusion/functions-table/Cargo.toml
+++ b/datafusion/functions-table/Cargo.toml
@@ -48,7 +48,7 @@ datafusion-common = { workspace = true }
datafusion-expr = { workspace = true }
datafusion-physical-plan = { workspace = true }
parking_lot = { workspace = true }
-paste = "1.0.14"
+paste = { workspace = true }
[dev-dependencies]
arrow = { workspace = true, features = ["test_utils"] }
diff --git a/datafusion/functions-window/Cargo.toml
b/datafusion/functions-window/Cargo.toml
index 7036bbec9d..42690907ae 100644
--- a/datafusion/functions-window/Cargo.toml
+++ b/datafusion/functions-window/Cargo.toml
@@ -50,4 +50,4 @@ datafusion-macros = { workspace = true }
datafusion-physical-expr = { workspace = true }
datafusion-physical-expr-common = { workspace = true }
log = { workspace = true }
-paste = "1.0.15"
+paste = { workspace = true }
diff --git a/datafusion/functions/Cargo.toml b/datafusion/functions/Cargo.toml
index ad52a551a7..a384e5635d 100644
--- a/datafusion/functions/Cargo.toml
+++ b/datafusion/functions/Cargo.toml
@@ -77,7 +77,7 @@ datafusion-execution = { workspace = true }
datafusion-expr = { workspace = true }
datafusion-expr-common = { workspace = true }
datafusion-macros = { workspace = true }
-hex = { version = "0.4", optional = true }
+hex = { workspace = true, optional = true }
itertools = { workspace = true }
log = { workspace = true }
md-5 = { version = "^0.10.0", optional = true }
diff --git a/datafusion/physical-expr/Cargo.toml
b/datafusion/physical-expr/Cargo.toml
index 69670941ad..9374297ecb 100644
--- a/datafusion/physical-expr/Cargo.toml
+++ b/datafusion/physical-expr/Cargo.toml
@@ -53,7 +53,7 @@ hashbrown = { workspace = true }
indexmap = { workspace = true }
itertools = { workspace = true, features = ["use_std"] }
parking_lot = { workspace = true }
-paste = "^1.0"
+paste = { workspace = true }
petgraph = "0.8.3"
tokio = { workspace = true }
diff --git a/datafusion/sql/Cargo.toml b/datafusion/sql/Cargo.toml
index 5e10781417..a814292a3d 100644
--- a/datafusion/sql/Cargo.toml
+++ b/datafusion/sql/Cargo.toml
@@ -72,5 +72,5 @@ datafusion-functions-window = { workspace = true }
env_logger = { workspace = true }
insta = { workspace = true }
itertools = { workspace = true }
-paste = "^1.0"
+paste = { workspace = true }
rstest = { workspace = true }
diff --git a/datafusion/substrait/Cargo.toml b/datafusion/substrait/Cargo.toml
index 0d7e34881c..558a2a5586 100644
--- a/datafusion/substrait/Cargo.toml
+++ b/datafusion/substrait/Cargo.toml
@@ -51,7 +51,7 @@ uuid = { version = "1.17.0", features = ["v4"] }
[dev-dependencies]
datafusion = { workspace = true, features = ["nested_expressions",
"unicode_expressions"] }
datafusion-functions-aggregate = { workspace = true }
-serde_json = "1.0"
+serde_json = { workspace = true }
tokio = { workspace = true }
insta = { workspace = true }
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]