You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by tu...@apache.org on 2024/06/01 14:01:09 UTC

(arrow-rs) branch master updated: Relax zstd-sys Version Pin (#5829)

This is an automated email from the ASF dual-hosted git repository.

tustvold pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow-rs.git


The following commit(s) were added to refs/heads/master by this push:
     new e4b28bd7872 Relax zstd-sys Version Pin (#5829)
e4b28bd7872 is described below

commit e4b28bd78726288c163bbc1ba019858de94cf22d
Author: Ruihang Xia <wa...@gmail.com>
AuthorDate: Sat Jun 1 22:01:03 2024 +0800

    Relax zstd-sys Version Pin (#5829)
    
    * build: pin zstd-sys to 2.0.7
    
    Signed-off-by: Ruihang Xia <wa...@gmail.com>
    
    * change to <=2.0.9
    
    Signed-off-by: Ruihang Xia <wa...@gmail.com>
    
    * <2.0.10
    
    Signed-off-by: Ruihang Xia <wa...@gmail.com>
    
    * also limit package zstd
    
    Signed-off-by: Ruihang Xia <wa...@gmail.com>
    
    * try multi selectors
    
    Signed-off-by: Ruihang Xia <wa...@gmail.com>
    
    * remove dep pin
    
    Signed-off-by: Ruihang Xia <wa...@gmail.com>
    
    * only pin for wasm target family
    
    Signed-off-by: Ruihang Xia <wa...@gmail.com>
    
    ---------
    
    Signed-off-by: Ruihang Xia <wa...@gmail.com>
---
 parquet/Cargo.toml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/parquet/Cargo.toml b/parquet/Cargo.toml
index 4f1a3879b90..775ac825a2e 100644
--- a/parquet/Cargo.toml
+++ b/parquet/Cargo.toml
@@ -52,10 +52,7 @@ snap = { version = "1.0", default-features = false, optional = true }
 brotli = { version = "6.0", default-features = false, features = ["std"], optional = true }
 flate2 = { version = "1.0", default-features = false, features = ["rust_backend"], optional = true }
 lz4_flex = { version = "0.11", default-features = false, features = ["std", "frame"], optional = true }
-zstd = { version = "0.13.0", optional = true, default-features = false }
-# TODO: temporary to fix parquet wasm build
-# upstream issue: https://github.com/gyscos/zstd-rs/issues/269
-zstd-sys = { version = "=2.0.9", optional = true, default-features = false }
+zstd = { version = "0.13", optional = true, default-features = false }
 chrono = { workspace = true }
 num = { version = "0.4", default-features = false }
 num-bigint = { version = "0.4", default-features = false }
@@ -80,15 +77,20 @@ brotli = { version = "6.0", default-features = false, features = ["std"] }
 flate2 = { version = "1.0", default-features = false, features = ["rust_backend"] }
 lz4_flex = { version = "0.11", default-features = false, features = ["std", "frame"] }
 zstd = { version = "0.13", default-features = false }
-# TODO: temporary to fix parquet wasm build
-# upstream issue: https://github.com/gyscos/zstd-rs/issues/269
-zstd-sys = { version = "=2.0.9", default-features = false }
 serde_json = { version = "1.0", features = ["std"], default-features = false }
 arrow = { workspace = true, features = ["ipc", "test_utils", "prettyprint", "json"] }
 tokio = { version = "1.0", default-features = false, features = ["macros", "rt", "io-util", "fs"] }
 rand = { version = "0.8", default-features = false, features = ["std", "std_rng"] }
 object_store = { version = "0.10.0", default-features = false, features = ["azure"] }
 
+# TODO: temporary to fix parquet wasm build
+# upstream issue: https://github.com/gyscos/zstd-rs/issues/269
+[target.'cfg(target_family = "wasm")'.dependencies]
+zstd-sys = { version = ">=2.0.0, <2.0.10", optional = true, default-features = false }
+
+[target.'cfg(target_family = "wasm")'.dev-dependencies]
+zstd-sys = { version = ">=2.0.0, <2.0.10", default-features = false }
+
 [package.metadata.docs.rs]
 all-features = true