From 2dce834a8f41f78adb297be647590bd2fe4fe2c1 Mon Sep 17 00:00:00 2001 From: renaud gaudin Date: Tue, 14 Nov 2023 15:35:03 +0000 Subject: [PATCH] Using libzim 9 --- .github/workflows/release.yaml | 2 +- .github/workflows/test.yml | 2 +- .github/workflows/wheels.yml | 2 +- CHANGELOG.md | 6 ++++++ setup.cfg | 4 ++-- setup.py | 4 ++-- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8d2b950..296a89c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -6,7 +6,7 @@ on: - published env: - LIBZIM_DL_VERSION: "8.2.1-1" + LIBZIM_DL_VERSION: "9.0.0" MACOSX_DEPLOYMENT_TARGET: "12.0" CIBW_ENVIRONMENT_PASS_LINUX: "LIBZIM_DL_VERSION" # APPLE_SIGNING_KEYCHAIN_PATH set in prepare keychain step diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 130b296..a455b98 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,7 +2,7 @@ name: test on: [push] env: - LIBZIM_DL_VERSION: "nightly" + LIBZIM_DL_VERSION: "9.0.0" MACOSX_DEPLOYMENT_TARGET: "12.0" jobs: diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 32d9a26..b97bf28 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -7,7 +7,7 @@ on: - main env: - LIBZIM_DL_VERSION: "nightly" + LIBZIM_DL_VERSION: "9.0.0" MACOSX_DEPLOYMENT_TARGET: "12.0" CIBW_ENVIRONMENT_PASS_LINUX: "LIBZIM_DL_VERSION" CIBW_BUILD_VERBOSITY: "3" diff --git a/CHANGELOG.md b/CHANGELOG.md index 09d4415..22ddfcd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [Unreleased] + +### Changed + +- Using C++ libzim 9.0.0 + ## [3.2.0] - 2023-09-15 ### Added diff --git a/setup.cfg b/setup.cfg index 51a6731..3e29c95 100644 --- a/setup.cfg +++ b/setup.cfg @@ -48,8 +48,8 @@ test_requires = [options.package_data] libzim = - libzim.8.dylib - libzim.so.8 + libzim.9.dylib + libzim.so.9 [isort] profile = black diff --git a/setup.py b/setup.py index f4c1a08..9dcaea2 100755 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ class Config: - libzim_dl_version: str = os.getenv("LIBZIM_DL_VERSION", "8.2.1-1") + libzim_dl_version: str = os.getenv("LIBZIM_DL_VERSION", "9.0.0") use_system_libzim: bool = bool(os.getenv("USE_SYSTEM_LIBZIM", False)) download_libzim: bool = not bool(os.getenv("DONT_DOWNLOAD_LIBZIM", False)) @@ -62,7 +62,7 @@ class Config: @property def libzim_major(self) -> str: # assuming nightlies are for version 8.x - return 8 if self.is_nightly else self.libzim_dl_version[0] + return 9 if self.is_nightly else self.libzim_dl_version[0] @property def found_libzim(self) -> str: