Update to libzim 8

Uses libzim8 release and updates tests & release worflow:
- macos-10.15 has been removed
- macos-12 has no default python3.6 anymore. Using python-versions's 3.6.15 (downloaded)
- pytest7 now requires pythonpath in pyproject.toml
- using latest minor cython 0.29.32
- Updating blank ZIM's expected size. libzim8 creates a slightly larger ZIM for this.

Author: rgaudin

.github/workflows/release.yml

@@ -6,7 +6,7 @@ on:
       - v*
 
 env:
-  LIBZIM_VERSION: 7.2.2
+  LIBZIM_VERSION: 8.0.0
   LIBZIM_INCLUDE_PATH: include/zim
   TWINE_USERNAME: __token__
   TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
@@ -19,20 +19,20 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-10.15]
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+        os: [ubuntu-20.04, macos-12]
+        python-version: ["3.6.15", "3.7", "3.8", "3.9", "3.10"]
 
     steps:
       - uses: actions/checkout@v2
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4.2.0
         with:
           python-version: ${{ matrix.python-version }}
           architecture: x64
 
       - name: set macOS environ
-        if: matrix.os == 'macos-10.15'
+        if: matrix.os == 'macos-12'
         run: |
           echo LIBZIM_EXT=dylib >> $GITHUB_ENV
           echo LIBZIM_RELEASE=libzim_macos-x86_64-$LIBZIM_VERSION >> $GITHUB_ENV
@@ -41,7 +41,7 @@ jobs:
           echo RPATH=@loader_path/ >> $GITHUB_ENV
 
       - name: install Apple certificate
-        if: matrix.os == 'macos-10.15'
+        if: matrix.os == 'macos-12'
         shell: bash
         env:
           CERTIFICATE: /tmp/wmch-devid.p12
@@ -86,33 +86,33 @@ jobs:
         if: matrix.os == 'ubuntu-20.04'
         run: |
           cp -dp $GITHUB_WORKSPACE/libzim_dist/lib/x86_64-linux-gnu/* lib/
-          ln -s libzim.so.${LIBZIM_VERSION:0:1} lib/libzim.so
-          ln -s $GITHUB_WORKSPACE/libzim_dist/$LIBZIM_INCLUDE_PATH include/zim
+          ln -sf libzim.so.${LIBZIM_VERSION:0:1} lib/libzim.so
+          ln -sf $GITHUB_WORKSPACE/libzim_dist/$LIBZIM_INCLUDE_PATH include/zim
 
       - name: Link macOS libzim dylib & headers into workspace lib and include folders
-        if: matrix.os == 'macos-10.15'
+        if: matrix.os == 'macos-12'
         run: |
           cp -Pp $GITHUB_WORKSPACE/libzim_dist/lib/* lib/
           ln -sf libzim.${LIBZIM_VERSION:0:1}.dylib lib/libzim.dylib
-          ln -s $GITHUB_WORKSPACE/libzim_dist/$LIBZIM_INCLUDE_PATH include/zim
+          ln -sf $GITHUB_WORKSPACE/libzim_dist/$LIBZIM_INCLUDE_PATH include/zim
 
       - name: Build cython and sdist
         run: |
-          pip install --upgrade "cython>=0.29.30,<3.0" setuptools pip wheel
+          pip install --upgrade "cython>=0.29.32,<3.0" setuptools pip wheel
           python3 setup.py build_ext --rpath $RPATH
           if [[  "${{ matrix.python-version }}" == "3.8" ]]
           then
             python3 setup.py sdist
           fi
 
       - name: add macOS libzim binary to source for wheel
-        if: matrix.os == 'macos-10.15'
+        if: matrix.os == 'macos-12'
         run: |
           install_name_tool -change libzim.${LIBZIM_VERSION:0:1}.dylib @loader_path/libzim.${LIBZIM_VERSION:0:1}.dylib $(find build -name "libzim.cpython*.so")
           cp -pv lib/libzim.${LIBZIM_VERSION:0:1}.dylib $(find build/lib* -type d)/
 
       - name: sign macOS wrapper binary
-        if: matrix.os == 'macos-10.15'
+        if: matrix.os == 'macos-12'
         run: |
           echo "make sure libzim is signed and notarized"
           spctl -a -v -t install lib/libzim.${LIBZIM_VERSION:0:1}.dylib

.github/workflows/test.yml

@@ -2,7 +2,7 @@ name: test
 on: [push]
 
 env:
-  LIBZIM_VERSION: 7.2.2
+  LIBZIM_VERSION: 8.0.0
   LIBZIM_INCLUDE_PATH: include/zim
   CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
   PROFILE: 1
@@ -29,31 +29,31 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-10.15]
-        python: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+        os: [ubuntu-20.04, macos-12]
+        python: ["3.6.15", "3.7", "3.8", "3.9", "3.10"]
 
     steps:
       - uses: actions/checkout@v2
 
       - name: Set up Python ${{ matrix.python }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4.2.0
         with:
           python-version: ${{ matrix.python }}
           architecture: x64
 
       - name: set macOS environ
-        if: matrix.os == 'macos-10.15'
+        if: matrix.os == 'macos-12'
         run: |
           echo LIBZIM_EXT=dylib >> $GITHUB_ENV
           echo LIBZIM_RELEASE=libzim_macos-x86_64-$LIBZIM_VERSION >> $GITHUB_ENV
-          echo LIBZIM_LIBRARY_PATH=lib/libzim.7.dylib >> $GITHUB_ENV
+          echo LIBZIM_LIBRARY_PATH=lib/libzim.8.dylib >> $GITHUB_ENV
 
       - name: set linux environ
         if: matrix.os == 'ubuntu-20.04'
         run: |
           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.7.2.2 >> $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
@@ -81,22 +81,17 @@ jobs:
         run: |
           sudo ldconfig $PWD/lib
 
-      - name: update macOS shared objects cache
-        if: matrix.os == 'macos-10.15'
-        run: |
-          export DYLD_LIBRARY_PATH="$PWD/lib:$DYLD_LIBRARY_PATH"
-
       - name: Build cython, sdist, and bdist_wheel
         run: |
-          pip install --upgrade pip install "cython>=0.29.30,<3.0" setuptools pip wheel
+          pip install --upgrade pip install "cython>=0.29.32,<3.0" setuptools pip wheel
           python3 setup.py build_ext --inplace
           python3 setup.py sdist bdist_wheel
 
       - name: Test built package with pytest
         run: |
           pip install pytest pytest-cov
           pip install -e .
-          export DYLD_LIBRARY_PATH="$PWD/lib:$DYLD_LIBRARY_PATH"
+          export DYLD_LIBRARY_PATH="$PWD:$PWD/lib:$DYLD_LIBRARY_PATH"
           pytest --cov=libzim --cov-report=term --cov-report term-missing .
 
       - name: Upload coverage report to codecov

CHANGELOG.md

@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Removed `lzma` compression option (#150)
 
+### Changed
+
+- Using libzim 8.0.0
+
 ## [1.1.1] – 2022-06-17
 
 ### Changed

pyproject.toml

@@ -8,3 +8,4 @@ target-version = ['py36', 'py37', 'py38', 'py39', 'py310']
 
 [tool.pytest.ini_options]
 testpaths = ["tests"]
+pythonpath = ["."]

tests/test_libzim_reader.py

@@ -17,7 +17,7 @@
 ZIMS_DATA = {
     "blank.zim": {
         "filename": "blank.zim",
-        "filesize": 1173,
+        "filesize": 2197,
         "new_ns": True,
         "mutlipart": False,
         "zim_uuid": None,