Skip to content

Commit

Permalink
Using libzim 9
Browse files Browse the repository at this point in the history
  • Loading branch information
rgaudin committed Nov 15, 2023
1 parent 0525755 commit 2dce834
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 2dce834

Please sign in to comment.