You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iceberg.apache.org by li...@apache.org on 2025/04/14 06:00:19 UTC
(iceberg-rust) branch main updated: chore(deps): refine minimal deps (#1209)
This is an automated email from the ASF dual-hosted git repository.
liurenjie1024 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg-rust.git
The following commit(s) were added to refs/heads/main by this push:
new 3db91957 chore(deps): refine minimal deps (#1209)
3db91957 is described below
commit 3db91957287b5ec9c50e5b2f7fde64b5a353f75d
Author: xxchan <xx...@gmail.com>
AuthorDate: Mon Apr 14 14:00:14 2025 +0800
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.
(https://github.com/apache/iceberg-rust/pull/1203#discussion_r2040593754)
- bump reqwest, bytes to newer version to resolve some minimal version
build issue (not latest)
- Closes #.
---------
Signed-off-by: xxchan <xx...@gmail.com>
---
.github/workflows/ci.yml | 5 -----
Cargo.lock | 6 +++---
Cargo.toml | 8 ++++----
crates/catalog/hms/Cargo.toml | 17 +++++++++++++----
crates/iceberg/Cargo.toml | 1 -
5 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7ff28734..2eb891a9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -153,11 +153,6 @@ jobs:
- name: Generate minimal versions lockfile
run: |
cargo generate-lockfile -Z direct-minimal-versions -Z minimal-versions
- # Some dependencies don't correctly specify a minimal version for their dependencies and will fail to build.
- # So we update these transitive dependencies here.
- cargo update faststr metainfo linkedbytes
- # munge 0.4.2 will cause fail to use 1.7.1 so specify the correct version here.
- cargo update -p munge --precise 0.4.1
- name: Setup MSRV Rust toolchain
uses: ./.github/actions/setup-builder
with:
diff --git a/Cargo.lock b/Cargo.lock
index b319e659..09358e89 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3151,7 +3151,6 @@ dependencies = [
"serde_json",
"serde_repr",
"serde_with",
- "tap",
"tempfile",
"tera",
"thrift",
@@ -3202,6 +3201,7 @@ dependencies = [
"tracing",
"typed-builder 0.20.1",
"uuid",
+ "volo",
"volo-thrift",
]
@@ -6890,9 +6890,9 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
[[package]]
name = "volo"
-version = "0.10.5"
+version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac20a85aab7ec8c48f7ba97d66b97c6a6e33af03196ac34992421d60b49ac099"
+checksum = "13832c5e356d13ae8944fa06ef9cf64ea24ea14c0a2e347c4ead078c927d4ade"
dependencies = [
"async-broadcast",
"dashmap",
diff --git a/Cargo.toml b/Cargo.toml
index 36d2d6e3..90513928 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -55,7 +55,7 @@ async-trait = "0.1.86"
aws-config = "1.5"
aws-sdk-glue = "1.39"
bimap = "0.6"
-bytes = "1.6"
+bytes = "1.9"
chrono = "0.4.38"
ctor = "0.2.8"
clap = { version = "4.5.27", features = ["derive", "cargo"] }
@@ -89,7 +89,7 @@ port_scanner = "0.1.5"
pretty_assertions = "1.4"
rand = "0.8.5"
regex = "1.10.5"
-reqwest = { version = "0.12.2", default-features = false, features = ["json"] }
+reqwest = { version = "0.12.12", default-features = false, features = ["json"] }
roaring = { version = "0.10", git = "https://github.com/RoaringBitmap/roaring-rs.git" }
rust_decimal = "1.31"
serde = { version = "1.0.204", features = ["rc"] }
@@ -99,7 +99,6 @@ serde_json = "1.0.138"
serde_repr = "0.1.16"
serde_with = "3.4"
stacker = "0.1.20"
-tap = "1.0.1"
tempfile = "3.18"
tera = "1"
thrift = "0.17.0"
@@ -110,5 +109,6 @@ typed-builder = "0.20"
toml = "0.8"
url = "2.5.4"
uuid = { version = "1.14", features = ["v7"] }
-volo-thrift = "0.10"
+volo = "0.10.6"
+volo-thrift = "0.10.6"
zstd = "0.13.2"
diff --git a/crates/catalog/hms/Cargo.toml b/crates/catalog/hms/Cargo.toml
index 5d7da26e..0b562a8d 100644
--- a/crates/catalog/hms/Cargo.toml
+++ b/crates/catalog/hms/Cargo.toml
@@ -32,11 +32,8 @@ repository = { workspace = true }
anyhow = { workspace = true }
async-trait = { workspace = true }
chrono = { workspace = true }
-faststr = {workspace = true}
hive_metastore = { workspace = true }
iceberg = { workspace = true }
-linkedbytes = {workspace = true}
-metainfo = {workspace = true}
pilota = { workspace = true }
serde_json = { workspace = true }
tokio = { workspace = true }
@@ -45,6 +42,18 @@ typed-builder = { workspace = true }
uuid = { workspace = true }
volo-thrift = { workspace = true }
+# Transitive dependencies below
+
+# Some dependencies don't correctly specify a minimal version for their dependencies and will fail to build in minimal versions build.
+# So we specify the version of these transitive dependencies here.
+# They can be removed when the direct dependencies are updated.
+
+# transitive dependencies of pilota/volo-thrift
+volo = { workspace = true }
+faststr = { workspace = true }
+linkedbytes = { workspace = true }
+metainfo = { workspace = true }
+
[dev-dependencies]
ctor = { workspace = true }
iceberg_test_utils = { path = "../../test_utils", features = ["tests"] }
@@ -52,4 +61,4 @@ port_scanner = { workspace = true }
[package.metadata.cargo-machete]
# These dependencies are added to ensure minimal dependency version
-ignored = ["faststr", "linkedbytes", "metainfo"]
\ No newline at end of file
+ignored = ["faststr", "linkedbytes", "metainfo", "volo"]
diff --git a/crates/iceberg/Cargo.toml b/crates/iceberg/Cargo.toml
index 9f77ca57..8795edc7 100644
--- a/crates/iceberg/Cargo.toml
+++ b/crates/iceberg/Cargo.toml
@@ -79,7 +79,6 @@ serde_derive = { workspace = true }
serde_json = { workspace = true }
serde_repr = { workspace = true }
serde_with = { workspace = true }
-tap = {workspace = true}
thrift = { workspace = true }
tokio = { workspace = true, optional = false, features = ["sync"] }
typed-builder = { workspace = true }