Skip to content

Commit 3db9195

Browse files
authored
chore(deps): refine minimal deps (#1209)
## Which issue does this PR close? - remove tap, it's not needed any more after #1203. Added by mistake in #1194 - remove cargo update in minimal versions gen, since we put them in Cargo.toml now. (#1203 (comment)) - bump reqwest, bytes to newer version to resolve some minimal version build issue (not latest) - Closes #. --------- Signed-off-by: xxchan <xxchan22f@gmail.com>
1 parent c24f077 commit 3db9195

File tree

5 files changed

+20
-17
lines changed

5 files changed

+20
-17
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,6 @@ jobs:
153153
- name: Generate minimal versions lockfile
154154
run: |
155155
cargo generate-lockfile -Z direct-minimal-versions -Z minimal-versions
156-
# Some dependencies don't correctly specify a minimal version for their dependencies and will fail to build.
157-
# So we update these transitive dependencies here.
158-
cargo update faststr metainfo linkedbytes
159-
# munge 0.4.2 will cause fail to use 1.7.1 so specify the correct version here.
160-
cargo update -p munge --precise 0.4.1
161156
- name: Setup MSRV Rust toolchain
162157
uses: ./.github/actions/setup-builder
163158
with:

Cargo.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ async-trait = "0.1.86"
5555
aws-config = "1.5"
5656
aws-sdk-glue = "1.39"
5757
bimap = "0.6"
58-
bytes = "1.6"
58+
bytes = "1.9"
5959
chrono = "0.4.38"
6060
ctor = "0.2.8"
6161
clap = { version = "4.5.27", features = ["derive", "cargo"] }
@@ -89,7 +89,7 @@ port_scanner = "0.1.5"
8989
pretty_assertions = "1.4"
9090
rand = "0.8.5"
9191
regex = "1.10.5"
92-
reqwest = { version = "0.12.2", default-features = false, features = ["json"] }
92+
reqwest = { version = "0.12.12", default-features = false, features = ["json"] }
9393
roaring = { version = "0.10", git = "https://github.com/RoaringBitmap/roaring-rs.git" }
9494
rust_decimal = "1.31"
9595
serde = { version = "1.0.204", features = ["rc"] }
@@ -99,7 +99,6 @@ serde_json = "1.0.138"
9999
serde_repr = "0.1.16"
100100
serde_with = "3.4"
101101
stacker = "0.1.20"
102-
tap = "1.0.1"
103102
tempfile = "3.18"
104103
tera = "1"
105104
thrift = "0.17.0"
@@ -110,5 +109,6 @@ typed-builder = "0.20"
110109
toml = "0.8"
111110
url = "2.5.4"
112111
uuid = { version = "1.14", features = ["v7"] }
113-
volo-thrift = "0.10"
112+
volo = "0.10.6"
113+
volo-thrift = "0.10.6"
114114
zstd = "0.13.2"

crates/catalog/hms/Cargo.toml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,8 @@ repository = { workspace = true }
3232
anyhow = { workspace = true }
3333
async-trait = { workspace = true }
3434
chrono = { workspace = true }
35-
faststr = {workspace = true}
3635
hive_metastore = { workspace = true }
3736
iceberg = { workspace = true }
38-
linkedbytes = {workspace = true}
39-
metainfo = {workspace = true}
4037
pilota = { workspace = true }
4138
serde_json = { workspace = true }
4239
tokio = { workspace = true }
@@ -45,11 +42,23 @@ typed-builder = { workspace = true }
4542
uuid = { workspace = true }
4643
volo-thrift = { workspace = true }
4744

45+
# Transitive dependencies below
46+
47+
# Some dependencies don't correctly specify a minimal version for their dependencies and will fail to build in minimal versions build.
48+
# So we specify the version of these transitive dependencies here.
49+
# They can be removed when the direct dependencies are updated.
50+
51+
# transitive dependencies of pilota/volo-thrift
52+
volo = { workspace = true }
53+
faststr = { workspace = true }
54+
linkedbytes = { workspace = true }
55+
metainfo = { workspace = true }
56+
4857
[dev-dependencies]
4958
ctor = { workspace = true }
5059
iceberg_test_utils = { path = "../../test_utils", features = ["tests"] }
5160
port_scanner = { workspace = true }
5261

5362
[package.metadata.cargo-machete]
5463
# These dependencies are added to ensure minimal dependency version
55-
ignored = ["faststr", "linkedbytes", "metainfo"]
64+
ignored = ["faststr", "linkedbytes", "metainfo", "volo"]

crates/iceberg/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ serde_derive = { workspace = true }
7979
serde_json = { workspace = true }
8080
serde_repr = { workspace = true }
8181
serde_with = { workspace = true }
82-
tap = {workspace = true}
8382
thrift = { workspace = true }
8483
tokio = { workspace = true, optional = false, features = ["sync"] }
8584
typed-builder = { workspace = true }

0 commit comments

Comments
 (0)