From 6c54b23fa38a9c8e72ee8e3a587555710a22fd5f Mon Sep 17 00:00:00 2001 From: renaud gaudin Date: Thu, 10 Jun 2021 09:15:15 +0000 Subject: [PATCH] Using libzim 6.3.2 Updated worklow for github's env update --- .github/workflows/release.yml | 22 +++++++++++----------- .github/workflows/test.yml | 16 ++++++++-------- CHANGELOG.md | 5 +++++ setup.py | 2 +- 4 files changed, 25 insertions(+), 20 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a4e073ff..a1d39f76 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,7 +6,7 @@ on: - v* env: - LIBZIM_VERSION: 6.1.7 + LIBZIM_VERSION: 6.3.2 LIBZIM_INCLUDE_PATH: include/zim TWINE_USERNAME: __token__ TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} @@ -34,20 +34,20 @@ jobs: - name: set macOS environ if: matrix.os == 'macos-latest' run: | - echo ::set-env name=LIBZIM_EXT::dylib - echo ::set-env name=LIBZIM_RELEASE::libzim_macos-x86_64-$LIBZIM_VERSION - echo ::set-env name=LIBZIM_LIBRARY_PATH::lib/libzim.${LIBZIM_VERSION:0:1}.dylib - echo ::set-env name=PLAFTORM_NAME::macosx_10.9_x86_64 - echo ::set-env name=RPATH::@loader_path/ + echo LIBZIM_EXT=dylib >> $GITHUB_ENV + echo LIBZIM_RELEASE=libzim_macos-x86_64-$LIBZIM_VERSION >> $GITHUB_ENV + echo LIBZIM_LIBRARY_PATH=lib/libzim.${LIBZIM_VERSION:0:1}.dylib >> $GITHUB_ENV + echo PLAFTORM_NAME=macosx_10.9_x86_64 >> $GITHUB_ENV + echo RPATH=@loader_path/ >> $GITHUB_ENV - name: set linux environ if: matrix.os == 'ubuntu-latest' run: | - echo ::set-env name=LIBZIM_EXT::so - echo ::set-env name=LIBZIM_RELEASE::libzim_linux-x86_64-$LIBZIM_VERSION - echo ::set-env name=LIBZIM_LIBRARY_PATH::lib/x86_64-linux-gnu/libzim.so.$LIBZIM_VERSION - echo ::set-env name=PLAFTORM_NAME::manylinux1_x86_64 - echo ::set-env name=RPATH::\$ORIGIN + echo LIBZIM_EXT=so >> $GITHUB_ENV + echo LIBZIM_RELEASE=libzim_linux-x86_64-$LIBZIM_VERSION >> $GITHUB_ENV + echo LIBZIM_LIBRARY_PATH=lib/x86_64-linux-gnu/libzim.so.$LIBZIM_VERSION >> $GITHUB_ENV + echo PLAFTORM_NAME=manylinux1_x86_64 >> $GITHUB_ENV + echo RPATH=\$ORIGIN >> $GITHUB_ENV - name: Cache libzim dylib & headers uses: actions/cache@master diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3bac71d7..dd73ef7f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,7 +2,7 @@ name: test on: [push] env: - LIBZIM_VERSION: 6.1.7 + LIBZIM_VERSION: 6.3.2 LIBZIM_INCLUDE_PATH: include/zim MAX_LINE_LENGTH: 110 @@ -20,7 +20,7 @@ jobs: - name: Autoformat with black run: | - pip install black + pip install black==19.10b0 black --check --exclude=setup.py . - name: Lint with flake8 @@ -53,16 +53,16 @@ jobs: - name: set macOS environ if: matrix.os == 'macos-latest' run: | - echo ::set-env name=LIBZIM_EXT::dylib - echo ::set-env name=LIBZIM_RELEASE::libzim_macos-x86_64-$LIBZIM_VERSION - echo ::set-env name=LIBZIM_LIBRARY_PATH::lib/libzim.${LIBZIM_VERSION:0:1}.dylib + echo LIBZIM_EXT=dylib >> $GITHUB_ENV + echo LIBZIM_RELEASE=libzim_macos-x86_64-$LIBZIM_VERSION >> $GITHUB_ENV + echo LIBZIM_LIBRARY_PATH=lib/libzim.${LIBZIM_VERSION:0:1}.dylib >> $GITHUB_ENV - name: set linux environ if: matrix.os == 'ubuntu-latest' run: | - echo ::set-env name=LIBZIM_EXT::so - echo ::set-env name=LIBZIM_RELEASE::libzim_linux-x86_64-$LIBZIM_VERSION - echo ::set-env name=LIBZIM_LIBRARY_PATH::lib/x86_64-linux-gnu/libzim.so.$LIBZIM_VERSION + echo LIBZIM_EXT=so >> $GITHUB_ENV + echo LIBZIM_RELEASE=libzim_linux-x86_64-$LIBZIM_VERSION >> $GITHUB_ENV + echo LIBZIM_LIBRARY_PATH=lib/x86_64-linux-gnu/libzim.so.$LIBZIM_VERSION >> $GITHUB_ENV - name: Cache libzim dylib & headers uses: actions/cache@master diff --git a/CHANGELOG.md b/CHANGELOG.md index 36710818..5d61c186 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 0.1 + +* Using libzim 6.3.2 which compresses zstd at level 19 which is required + to keep decompression RAM allocation under control on 32b systems + ## 0.0.3.post0 * fixed access to bundled libzim on macOS (missing rpath) diff --git a/setup.py b/setup.py index 01db6041..2b0e16fd 100755 --- a/setup.py +++ b/setup.py @@ -93,7 +93,7 @@ def get_long_description(): setup( # Basic information about libzim module name="libzim", - version="0.0.3.post0", + version="0.1", url=GITHUB_URL, project_urls={ 'Source': GITHUB_URL,