Skip to content

Commit 0366f0e

Browse files
Jefffreyalamb
Jefffrey
and
alamb
authored
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]>
1 parent 8ab8342 commit 0366f0e

File tree

14 files changed

+25
-20
lines changed

14 files changed

+25
-20
lines changed

‎Cargo.toml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ arrow-schema = { version = "57.0.0", default-features = false }
107107
async-trait = "0.1.89"
108108
bigdecimal = "0.4.8"
109109
bytes = "1.11"
110+
bzip2 = "0.6.1"
110111
chrono = { version = "0.4.42", default-features = false }
111112
criterion = "0.7"
112113
ctor = "0.6.1"
@@ -151,7 +152,9 @@ datafusion-substrait = { path = "datafusion/substrait", version = "51.0.0" }
151152

152153
doc-comment = "0.3"
153154
env_logger = "0.11"
155+
flate2 = "1.1.5"
154156
futures = "0.3"
157+
glob = "0.3.0"
155158
half = { version = "2.7.0", default-features = false }
156159
hashbrown = { version = "0.14.5", features = ["raw"] }
157160
hex = { version = "0.4.3" }
@@ -168,6 +171,7 @@ parquet = { version = "57.0.0", default-features = false, features = [
168171
"async",
169172
"object_store",
170173
] }
174+
paste = "1.0.15"
171175
pbjson = { version = "0.8.0" }
172176
pbjson-types = "0.8"
173177
# Should match arrow-flight's version of prost.
@@ -183,6 +187,7 @@ testcontainers = { version = "0.25.2", features = ["default"] }
183187
testcontainers-modules = { version = "0.13" }
184188
tokio = { version = "1.48", features = ["macros", "rt", "sync"] }
185189
url = "2.5.7"
190+
zstd = { version = "0.13", default-features = false }
186191

187192
[workspace.lints.clippy]
188193
# Detects large stack-allocated futures that may cause stack overflow crashes (see threshold in clippy.toml)

‎datafusion/common/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ libc = "0.2.177"
7272
log = { workspace = true }
7373
object_store = { workspace = true, optional = true }
7474
parquet = { workspace = true, optional = true, default-features = true }
75-
paste = "1.0.15"
75+
paste = { workspace = true }
7676
recursive = { workspace = true, optional = true }
7777
sqlparser = { workspace = true, optional = true }
7878
tokio = { workspace = true }

‎datafusion/core/Cargo.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ arrow = { workspace = true }
114114
arrow-schema = { workspace = true, features = ["canonical_extension_types"] }
115115
async-trait = { workspace = true }
116116
bytes = { workspace = true }
117-
bzip2 = { version = "0.6.1", optional = true }
117+
bzip2 = { workspace = true, optional = true }
118118
chrono = { workspace = true }
119119
datafusion-catalog = { workspace = true }
120120
datafusion-catalog-listing = { workspace = true }
@@ -142,7 +142,7 @@ datafusion-physical-optimizer = { workspace = true }
142142
datafusion-physical-plan = { workspace = true }
143143
datafusion-session = { workspace = true }
144144
datafusion-sql = { workspace = true, optional = true }
145-
flate2 = { version = "1.1.5", optional = true }
145+
flate2 = { workspace = true, optional = true }
146146
futures = { workspace = true }
147147
itertools = { workspace = true }
148148
liblzma = { workspace = true, optional = true }
@@ -159,7 +159,7 @@ tempfile = { workspace = true }
159159
tokio = { workspace = true }
160160
url = { workspace = true }
161161
uuid = { version = "1.18", features = ["v4", "js"] }
162-
zstd = { version = "0.13", optional = true, default-features = false }
162+
zstd = { workspace = true, optional = true }
163163

164164
[dev-dependencies]
165165
async-trait = { workspace = true }
@@ -172,9 +172,9 @@ datafusion-macros = { workspace = true }
172172
datafusion-physical-optimizer = { workspace = true }
173173
doc-comment = { workspace = true }
174174
env_logger = { workspace = true }
175-
glob = { version = "0.3.0" }
175+
glob = { workspace = true }
176176
insta = { workspace = true }
177-
paste = "^1.0"
177+
paste = { workspace = true }
178178
rand = { workspace = true, features = ["small_rng"] }
179179
rand_distr = "0.5"
180180
regex = { workspace = true }

‎datafusion/datasource/Cargo.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ async-compression = { version = "0.4.30", features = [
4545
], optional = true }
4646
async-trait = { workspace = true }
4747
bytes = { workspace = true }
48-
bzip2 = { version = "0.6.1", optional = true }
48+
bzip2 = { workspace = true, optional = true }
4949
chrono = { workspace = true }
5050
datafusion-common = { workspace = true, features = ["object_store"] }
5151
datafusion-common-runtime = { workspace = true }
@@ -56,9 +56,9 @@ datafusion-physical-expr-adapter = { workspace = true }
5656
datafusion-physical-expr-common = { workspace = true }
5757
datafusion-physical-plan = { workspace = true }
5858
datafusion-session = { workspace = true }
59-
flate2 = { version = "1.1.5", optional = true }
59+
flate2 = { workspace = true, optional = true }
6060
futures = { workspace = true }
61-
glob = "0.3.0"
61+
glob = { workspace = true }
6262
itertools = { workspace = true }
6363
liblzma = { workspace = true, optional = true }
6464
log = { workspace = true }
@@ -68,7 +68,7 @@ tempfile = { workspace = true, optional = true }
6868
tokio = { workspace = true }
6969
tokio-util = { version = "0.7.17", features = ["io"], optional = true }
7070
url = { workspace = true }
71-
zstd = { version = "0.13", optional = true, default-features = false }
71+
zstd = { workspace = true, optional = true }
7272

7373
[dev-dependencies]
7474
criterion = { workspace = true }

‎datafusion/expr-common/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ arrow = { workspace = true }
4545
datafusion-common = { workspace = true }
4646
indexmap = { workspace = true }
4747
itertools = { workspace = true }
48-
paste = "^1.0"
48+
paste = { workspace = true }

‎datafusion/expr/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ datafusion-functions-window-common = { workspace = true }
5757
datafusion-physical-expr-common = { workspace = true }
5858
indexmap = { workspace = true }
5959
itertools = { workspace = true }
60-
paste = "^1.0"
60+
paste = { workspace = true }
6161
recursive = { workspace = true, optional = true }
6262
serde_json = { workspace = true }
6363
sqlparser = { workspace = true, optional = true }

‎datafusion/functions-aggregate/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ datafusion-physical-expr = { workspace = true }
5353
datafusion-physical-expr-common = { workspace = true }
5454
half = { workspace = true }
5555
log = { workspace = true }
56-
paste = "1.0.14"
56+
paste = { workspace = true }
5757

5858
[dev-dependencies]
5959
arrow = { workspace = true, features = ["test_utils"] }

‎datafusion/functions-nested/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ datafusion-macros = { workspace = true }
5959
datafusion-physical-expr-common = { workspace = true }
6060
itertools = { workspace = true, features = ["use_std"] }
6161
log = { workspace = true }
62-
paste = "1.0.14"
62+
paste = { workspace = true }
6363

6464
[dev-dependencies]
6565
criterion = { workspace = true, features = ["async_tokio"] }

‎datafusion/functions-table/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ datafusion-common = { workspace = true }
4848
datafusion-expr = { workspace = true }
4949
datafusion-physical-plan = { workspace = true }
5050
parking_lot = { workspace = true }
51-
paste = "1.0.14"
51+
paste = { workspace = true }
5252

5353
[dev-dependencies]
5454
arrow = { workspace = true, features = ["test_utils"] }

‎datafusion/functions-window/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ datafusion-macros = { workspace = true }
5050
datafusion-physical-expr = { workspace = true }
5151
datafusion-physical-expr-common = { workspace = true }
5252
log = { workspace = true }
53-
paste = "1.0.15"
53+
paste = { workspace = true }

0 commit comments

Comments
 (0)