From 16de80fe88ba389dc9bfa2515a3a6d3cee94c1d1 Mon Sep 17 00:00:00 2001 From: Miles Granger Date: Thu, 25 Apr 2024 15:54:54 +0200 Subject: [PATCH] debugging: try blosc2-rs branch auto static for musl --- .github/workflows/CI-python.yml | 9 +-------- libcramjam/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/CI-python.yml b/.github/workflows/CI-python.yml index cd839b11..1cfeefe8 100644 --- a/.github/workflows/CI-python.yml +++ b/.github/workflows/CI-python.yml @@ -151,11 +151,6 @@ jobs: with: target: ${{ matrix.conf.target-triple }} - # - uses: Swatinem/rust-cache@v2 - # name: Rust Cache - # with: - # prefix-key: ${{ matrix.conf.os }}-${{ matrix.conf.manylinux }}-${{ matrix.conf.target-triple }}-${{ matrix.conf.python-architecture }}-${{ matrix.package.name }} - - name: Setup (Mac) if: runner.os == 'macOS' run: | @@ -212,8 +207,6 @@ jobs: mv $WORKSPACE/build/$TARGET_TRIPLE/release/build/$blosc2_sys_dir/out $BLOSC2_INSTALL_PREFIX tree -L 2 $BLOSC2_INSTALL_PREFIX - # Redundant to do audit and tests for all python versions - # Redundant to do audit and tests for all python versions - name: Rust Tests if: matrix.conf.target == 'x86_64' && !startsWith(matrix.python-version, 'pypy') && matrix.python-version == '3.12' @@ -226,7 +219,7 @@ jobs: target: ${{ matrix.conf.target }} manylinux: ${{ matrix.conf.manylinux }} docker-options: -e BLOSC2_INSTALL_PREFIX=${{ github.workspace }}/blosc2 -e LD_LIBRARY_PATH=${{ github.workspace }}/blosc2/lib:${{ github.workspace }}/blosc2/lib64 - args: -i ${{ matrix.python-version }} --release --out dist --manifest-path ${{ matrix.package.dir }}/Cargo.toml --features use-system-blosc2 --features blosc2-static + args: -i ${{ matrix.python-version }} --release --out dist --manifest-path ${{ matrix.package.dir }}/Cargo.toml --features use-system-blosc2 before-script-linux: ls -l $BLOSC2_INSTALL_PREFIX - name: Build wheel (Windows) diff --git a/libcramjam/Cargo.toml b/libcramjam/Cargo.toml index f151c93b..28881401 100644 --- a/libcramjam/Cargo.toml +++ b/libcramjam/Cargo.toml @@ -32,7 +32,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 = { git = "https://github.com/milesgranger/blosc2-rs.git", optional = true } +blosc2-rs = { git = "https://github.com/milesgranger/blosc2-rs.git", optional = true, branch = "auto-static-for-musl" } zstd = { version = "^0.13", optional = true } xz2 = { version = "0.1.7", features = ["static"], optional = true }