Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/CI-wheels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- main

env:
LIBZIM_DL_VERSION: "9.8.1"
LIBZIM_DL_VERSION: "9.8.2"
MACOSX_DEPLOYMENT_TARGET: "13.0"
CIBW_ENVIRONMENT_PASS_LINUX: "LIBZIM_DL_VERSION"
CIBW_BUILD_VERBOSITY: "3"
Expand All @@ -22,7 +22,7 @@ jobs:
os: [macos-14, windows-2022, ubuntu-24.04]

steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7

- name: Set up QEMU
if: runner.os == 'Linux'
Expand All @@ -31,7 +31,7 @@ jobs:
platforms: all

- name: Build wheels
uses: pypa/cibuildwheel@v3.4
uses: pypa/cibuildwheel@v4.2

- uses: actions/upload-artifact@v7
with:
Expand All @@ -42,7 +42,7 @@ jobs:
name: Build source distribution
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7

- name: Build sdist
run: pipx run build --sdist
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/Publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- published

env:
LIBZIM_DL_VERSION: "9.8.1"
LIBZIM_DL_VERSION: "9.8.2"
MACOSX_DEPLOYMENT_TARGET: "13.0"
CIBW_ENVIRONMENT_PASS_LINUX: "LIBZIM_DL_VERSION"
# APPLE_SIGNING_KEYCHAIN_PATH set in prepare keychain step
Expand All @@ -25,7 +25,7 @@ jobs:
os: [ubuntu-24.04, macos-14, windows-2022]

steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7

- name: Set up QEMU
if: runner.os == 'Linux'
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
security unlock-keychain -p mysecretpassword ${APPLE_SIGNING_KEYCHAIN_PATH}

- name: Build wheels
uses: pypa/cibuildwheel@v3.4
uses: pypa/cibuildwheel@v4.2

- name: Cleanup Apple Keychain
if: matrix.os == 'macos-14'
Expand All @@ -87,7 +87,7 @@ jobs:
name: Build source distribution
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7

- name: Build sdist
run: pipx run build --sdist
Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:
name: wheels-windows-2022
path: dist

- uses: pypa/gh-action-pypi-publish@v1.13.0
- uses: pypa/gh-action-pypi-publish@v1.14.2
with:
user: __token__
# password: ${{ secrets.PYPI_TEST_API_TOKEN }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/QA.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ name: QA
on: [push]

env:
LIBZIM_DL_VERSION: "9.8.1"
LIBZIM_DL_VERSION: "9.8.2"
MACOSX_DEPLOYMENT_TARGET: "13.0"

jobs:
lint:
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7

- name: Set up Python
uses: actions/setup-python@v6
uses: actions/setup-python@v7
with:
python-version: "3.14"
architecture: x64
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/Tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Tests
on: [push]

env:
LIBZIM_DL_VERSION: "9.8.1"
LIBZIM_DL_VERSION: "9.8.2"
MACOSX_DEPLOYMENT_TARGET: "13.0"
# we want cython traces for coverage
PROFILE: "1"
Expand All @@ -16,10 +16,10 @@ jobs:
python: ["3.10", "3.11", "3.12", "3.13", "3.14", "3.14t"]

steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7

- name: Set up Python ${{ matrix.python }}
uses: actions/setup-python@v6
uses: actions/setup-python@v7
with:
python-version: ${{ matrix.python }}

Expand All @@ -40,7 +40,7 @@ jobs:

- name: Upload coverage report to codecov
if: matrix.os == 'ubuntu-24.04' && matrix.python == '3.14'
uses: codecov/codecov-action@v5
uses: codecov/codecov-action@v7
with:
fail_ci_if_error: true
token: ${{ secrets.CODECOV_TOKEN }}
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v6.0.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- repo: https://github.com/psf/black
rev: "25.1.0"
rev: "26.5.1"
hooks:
- id: black
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.9.5
rev: v0.16.5
hooks:
- id: ruff
- repo: https://github.com/RobertCraigie/pyright-python
rev: v1.1.393
rev: v1.1.411
hooks:
- id: pyright
name: pyright (system)
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

- Upgrade to libzim 9.8.2 and upgrade other Python dependencies, especially Cython 3.3.0 (#265)

## [3.12.0] - 2026-07-20

### Changed
Expand Down
30 changes: 15 additions & 15 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[build-system]
requires = [
"setuptools == 83.0.0",
"wheel == 0.47.0",
"cython == 3.2.8",
"setuptools == 84.0.0",
"wheel == 0.48.0",
"cython == 3.3.0",
# https://github.com/pypa/cibuildwheel/blob/v2.22/cibuildwheel/resources/constraints.txt
"delocate == 0.13.0 ; platform_system=='Windows'",
]
Expand Down Expand Up @@ -50,7 +50,7 @@ scripts = [
]
lint = [
"black==26.5.1",
"ruff==0.15.21",
"ruff==0.16.5",
"libzim",
"libzim[build]",
]
Expand All @@ -63,29 +63,29 @@ check = [
]
test = [
"pytest==9.1.1",
"coverage==7.15.2",
"coverage==7.15.4",
# for cython coverage plugin
"libzim[build]",
]
build = [
"setuptools == 83.0.0",
"wheel == 0.47.0",
"cython == 3.2.8",
"setuptools == 84.0.0",
"wheel == 0.48.0",
"cython == 3.3.0",
"delocate == 0.13.0 ; platform_system=='Windows'",
]
docs = [
"mkdocs==1.6.1",
"mkdocstrings-python==2.0.5",
"mkdocs-material==9.7.6",
"pymdown-extensions==11.0.1",
"mkdocstrings-python==2.0.7",
"mkdocs-material==9.7.7",
"pymdown-extensions==11.0.2",
"mkdocs-gen-files==0.6.1",
"mkdocs-literate-nav==0.6.3",
"mkdocs-include-markdown-plugin==7.3.0",
"griffe==2.1.0",
"griffe==2.2.0",
]
dev = [
"pre-commit==4.6.0",
"ipython==9.15.0",
"pre-commit==4.6.2",
"ipython==9.17.0",
"types-setuptools",
"libzim[scripts]",
"libzim[lint]",
Expand Down Expand Up @@ -285,7 +285,7 @@ ignore = [
# Ignore warnings on subprocess.run / popen
"S603",
# Ignore complexity
"C901", "PLR0911", "PLR0912", "PLR0913", "PLR0915",
"C901", "PLR0911", "PLR0912", "PLR0913", "PLR0915", "PLR0917",
]
unfixable = [
# Don't touch unused imports
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@


class Config:
libzim_dl_version: str = os.getenv("LIBZIM_DL_VERSION", "9.8.1")
libzim_dl_version: str = os.getenv("LIBZIM_DL_VERSION", "9.8.2")
use_system_libzim: bool = bool(os.getenv("USE_SYSTEM_LIBZIM") or False)
download_libzim: bool = not bool(os.getenv("DONT_DOWNLOAD_LIBZIM") or False)

Expand Down
12 changes: 8 additions & 4 deletions tests/test_libzim_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,15 +136,19 @@
"suggestion_string": "Free",
"suggestion_count": 1,
"suggestion_result": [
"FreedomBox for Communities_Offline Wikipedia "
"- Wikibooks, open books for an open world.html"
(
"FreedomBox for Communities_Offline Wikipedia "
"- Wikibooks, open books for an open world.html"
)
],
"search_string": "main",
"search_count": 2,
"search_result": [
"Wikibooks.html",
"FreedomBox for Communities_Offline Wikipedia "
"- Wikibooks, open books for an open world.html",
(
"FreedomBox for Communities_Offline Wikipedia "
"- Wikibooks, open books for an open world.html"
),
],
"test_path": "FreedomBox for Communities_Offline Wikipedia - Wikibooks, "
"open books for an open world.html",
Expand Down
Loading