From b8f92299c0d4ff6ab40aac60d52c7250602edbea Mon Sep 17 00:00:00 2001 From: Miles Granger Date: Sun, 12 Jan 2025 19:12:51 +0100 Subject: [PATCH 1/4] Bump blosc2-rs -> 0.4.0+2.15.2 --- Cargo.toml | 2 +- src/blosc2.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e1c129d..b67c622 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -64,7 +64,7 @@ lz4 = { version = "^1", optional = true } flate2 = { version = "^1", optional = true } libdeflater = { version = "^1", optional = true } libdeflate-sys = { version = "<1.20.0", optional = true } # TODO: requires gcc>=4.9 not available on Python's CI wheel builds -blosc2-rs = { version = "0.3.1+2.15.1", optional = true, default-features = false } +blosc2-rs = { version = "0.4.0+2.15.2", optional = true, default-features = false } zstd = { version = "^0.13", optional = true } xz2 = { version = "0.1.7", optional = true } diff --git a/src/blosc2.rs b/src/blosc2.rs index 4dc8b9b..7fa3f79 100644 --- a/src/blosc2.rs +++ b/src/blosc2.rs @@ -73,7 +73,7 @@ mod tests { #[test] fn test_compress() { - let _guard = blosc2::Blosc2Guard::new(); + let _guard = blosc2::Blosc2Guard::get_or_init(); let mut compressed = vec![]; let data = b"bytes"; compress(Cursor::new(data), &mut compressed).unwrap(); From d57ad4f9d5477987b2a67735f6c63e51912c52a3 Mon Sep 17 00:00:00 2001 From: Miles Granger Date: Sun, 12 Jan 2025 19:13:13 +0100 Subject: [PATCH 2/4] Remove blosc2, igzip, ideflate, izlib from default features --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index b67c622..638686a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ readme = "README.md" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [features] -default = ["snappy", "lz4", "bzip2", "brotli", "xz", "zstd", "gzip", "deflate", "blosc2", "igzip", "ideflate", "izlib", "zlib"] +default = ["snappy", "lz4", "bzip2", "brotli", "xz", "zstd", "gzip", "deflate", "zlib"] capi = ["dep:libc"] snappy = ["dep:snap"] lz4 = ["dep:lz4"] From 28786bbf8c9afc15ae77585f93c53fbc0aafd27d Mon Sep 17 00:00:00 2001 From: Miles Granger Date: Sun, 12 Jan 2025 19:12:27 +0100 Subject: [PATCH 3/4] Bump version 0.6.0 -> 0.7.0 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 638686a..f992098 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libcramjam" -version = "0.6.0" +version = "0.7.0" edition = "2021" license = "MIT" description = "Compression library combining a plethora of algorithms in a similar as possible API" From 8c65e1f5c20924e06935073e2eb09d197d81d7c6 Mon Sep 17 00:00:00 2001 From: Miles Granger Date: Sun, 12 Jan 2025 19:22:12 +0100 Subject: [PATCH 4/4] Remove brittle wasm builds --- .github/workflows/CI.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 2c1afe9..7837dad 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -98,18 +98,18 @@ jobs: !matrix.capi && matrix.codec run: cargo test -p libcramjam --lib --no-default-features --features ${{ matrix.codec }} - build-wasm32: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 + # build-wasm32: + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v4 - - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@stable - with: - target: wasm32-unknown-emscripten + # - name: Install Rust toolchain + # uses: dtolnay/rust-toolchain@stable + # with: + # target: wasm32-unknown-emscripten - - name: Install Emscripten - uses: mymindstorm/setup-emsdk@v14 + # - name: Install Emscripten + # uses: mymindstorm/setup-emsdk@v14 - - name: Build - run: cargo build --target wasm32-unknown-emscripten --features wasm32-compat + # - name: Build + # run: cargo build --target wasm32-unknown-emscripten --features wasm32-compat