Skip to content

Commit b0ee856

Browse files
authored
Merge pull request #250 from openzim/libzim_up
Upgrade to libzim 9.5.1 + Cython 3.2.4 + other deps
2 parents a7d1602 + 164f045 commit b0ee856

File tree

10 files changed

+58
-57
lines changed

10 files changed

+58
-57
lines changed

.github/workflows/CI-wheels.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- main
88

99
env:
10-
LIBZIM_DL_VERSION: "9.4.0-1"
10+
LIBZIM_DL_VERSION: "9.5.1"
1111
MACOSX_DEPLOYMENT_TARGET: "13.0"
1212
CIBW_ENVIRONMENT_PASS_LINUX: "LIBZIM_DL_VERSION"
1313
CIBW_BUILD_VERBOSITY: "3"
@@ -22,18 +22,18 @@ jobs:
2222
os: [macos-14, windows-2022, ubuntu-24.04]
2323

2424
steps:
25-
- uses: actions/checkout@v5
25+
- uses: actions/checkout@v6
2626

2727
- name: Set up QEMU
2828
if: runner.os == 'Linux'
29-
uses: docker/setup-qemu-action@v3
29+
uses: docker/setup-qemu-action@v4
3030
with:
3131
platforms: all
3232

3333
- name: Build wheels
34-
uses: pypa/cibuildwheel@v3.2
34+
uses: pypa/cibuildwheel@v3.4
3535

36-
- uses: actions/upload-artifact@v5
36+
- uses: actions/upload-artifact@v7
3737
with:
3838
name: wheels-${{ matrix.os }}
3939
path: ./wheelhouse/*.whl
@@ -42,12 +42,12 @@ jobs:
4242
name: Build source distribution
4343
runs-on: ubuntu-latest
4444
steps:
45-
- uses: actions/checkout@v5
45+
- uses: actions/checkout@v6
4646

4747
- name: Build sdist
4848
run: pipx run build --sdist
4949

50-
- uses: actions/upload-artifact@v5
50+
- uses: actions/upload-artifact@v7
5151
with:
5252
name: sdist
5353
path: dist/*.tar.gz

.github/workflows/Publish.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- published
77

88
env:
9-
LIBZIM_DL_VERSION: "9.4.0-1"
9+
LIBZIM_DL_VERSION: "9.5.1"
1010
MACOSX_DEPLOYMENT_TARGET: "13.0"
1111
CIBW_ENVIRONMENT_PASS_LINUX: "LIBZIM_DL_VERSION"
1212
# APPLE_SIGNING_KEYCHAIN_PATH set in prepare keychain step
@@ -25,11 +25,11 @@ jobs:
2525
os: [ubuntu-24.04, macos-14, windows-2022]
2626

2727
steps:
28-
- uses: actions/checkout@v5
28+
- uses: actions/checkout@v6
2929

3030
- name: Set up QEMU
3131
if: runner.os == 'Linux'
32-
uses: docker/setup-qemu-action@v3
32+
uses: docker/setup-qemu-action@v4
3333
with:
3434
platforms: all
3535

@@ -68,7 +68,7 @@ jobs:
6868
security unlock-keychain -p mysecretpassword ${APPLE_SIGNING_KEYCHAIN_PATH}
6969
7070
- name: Build wheels
71-
uses: pypa/cibuildwheel@v3.2
71+
uses: pypa/cibuildwheel@v3.4
7272

7373
- name: Cleanup Apple Keychain
7474
if: matrix.os == 'macos-14'
@@ -78,7 +78,7 @@ jobs:
7878
security delete-keychain ${APPLE_SIGNING_KEYCHAIN_PATH}
7979
rm -f ${APPLE_SIGNING_KEYCHAIN_PATH}
8080
81-
- uses: actions/upload-artifact@v5
81+
- uses: actions/upload-artifact@v7
8282
with:
8383
name: wheels-${{ matrix.os }}
8484
path: ./wheelhouse/*.whl
@@ -87,12 +87,12 @@ jobs:
8787
name: Build source distribution
8888
runs-on: ubuntu-latest
8989
steps:
90-
- uses: actions/checkout@v5
90+
- uses: actions/checkout@v6
9191

9292
- name: Build sdist
9393
run: pipx run build --sdist
9494

95-
- uses: actions/upload-artifact@v5
95+
- uses: actions/upload-artifact@v7
9696
with:
9797
name: sdist
9898
path: dist/*.tar.gz
@@ -103,19 +103,19 @@ jobs:
103103
environment: release
104104
steps:
105105
# retrieve all artifacts
106-
- uses: actions/download-artifact@v6
106+
- uses: actions/download-artifact@v8
107107
with:
108108
name: sdist
109109
path: dist
110-
- uses: actions/download-artifact@v6
110+
- uses: actions/download-artifact@v8
111111
with:
112112
name: wheels-ubuntu-24.04
113113
path: dist
114-
- uses: actions/download-artifact@v6
114+
- uses: actions/download-artifact@v8
115115
with:
116116
name: wheels-macos-14
117117
path: dist
118-
- uses: actions/download-artifact@v6
118+
- uses: actions/download-artifact@v8
119119
with:
120120
name: wheels-windows-2022
121121
path: dist

.github/workflows/QA.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ name: QA
22
on: [push]
33

44
env:
5-
LIBZIM_DL_VERSION: "9.4.0-1"
5+
LIBZIM_DL_VERSION: "9.5.1"
66
MACOSX_DEPLOYMENT_TARGET: "13.0"
77

88
jobs:
99
lint:
1010
runs-on: ubuntu-24.04
1111
steps:
12-
- uses: actions/checkout@v5
12+
- uses: actions/checkout@v6
1313

1414
- name: Set up Python
1515
uses: actions/setup-python@v6

.github/workflows/Tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Tests
22
on: [push]
33

44
env:
5-
LIBZIM_DL_VERSION: "9.4.0-1"
5+
LIBZIM_DL_VERSION: "9.5.1"
66
MACOSX_DEPLOYMENT_TARGET: "13.0"
77
# we want cython traces for coverage
88
PROFILE: "1"
@@ -16,7 +16,7 @@ jobs:
1616
python: ["3.10", "3.11", "3.12", "3.13", "3.13t", "3.14", "3.14t"]
1717

1818
steps:
19-
- uses: actions/checkout@v5
19+
- uses: actions/checkout@v6
2020

2121
- name: Set up Python ${{ matrix.python }}
2222
uses: actions/setup-python@v6

CHANGELOG.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10-
* fixed broken links in docs
11-
1210
### Added
13-
- Added Changelog to docs.
11+
12+
- Added Changelog to docs (#227)
13+
14+
### Changed
15+
16+
- Upgrade to libzim 9.5.1 and upgrade other Python dependencies, especially Cython 3.2.4 (#250)
17+
18+
### Fixed
19+
20+
- Fixed broken links in docs (#246)
1421

1522
## [3.8.0] - 2025-11-14
1623

docs/scripts/generate_api_nav.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,14 @@
4747

4848
# Create a document with mkdocstrings placeholders.
4949
with mkdocs_gen_files.open(full_doc_path, "w") as fd:
50-
fd.write(
51-
f"""---
50+
fd.write(f"""---
5251
title: {identifier}
5352
---
5453
5554
5655
::: {identifier}
5756
{module_options}
58-
"""
59-
)
57+
""")
6058

6159
# Make the edit button on the page link to the source file.
6260
mkdocs_gen_files.set_edit_path(full_doc_path, Path("..") / path.relative_to(root))

pyproject.toml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[build-system]
22
requires = [
3-
"setuptools == 80.9.0",
4-
"wheel == 0.45.1",
5-
"cython == 3.1.6",
3+
"setuptools == 82.0.1",
4+
"wheel == 0.46.3",
5+
"cython == 3.2.4",
66
# https://github.com/pypa/cibuildwheel/blob/v2.22/cibuildwheel/resources/constraints.txt
77
"delocate == 0.13.0 ; platform_system=='Windows'",
88
]
@@ -46,46 +46,46 @@ Donate = "https://www.kiwix.org/en/support-us/"
4646

4747
[project.optional-dependencies]
4848
scripts = [
49-
"invoke==2.2.0",
49+
"invoke==2.2.1",
5050
]
5151
lint = [
52-
"black==25.9.0",
53-
"ruff==0.14.3",
52+
"black==26.3.1",
53+
"ruff==0.15.7",
5454
"libzim",
5555
"libzim[build]",
5656
]
5757
check = [
58-
"pyright==1.1.407",
58+
"pyright==1.1.408",
5959
"libzim",
6060
"libzim[build]",
6161
"libzim[test]",
6262
"types-setuptools",
6363
]
6464
test = [
65-
"pytest==8.4.2",
66-
"coverage==7.11.0",
65+
"pytest==9.0.2",
66+
"coverage==7.13.5",
6767
# for cython coverage plugin
6868
"libzim[build]",
6969
]
7070
build = [
71-
"setuptools == 80.9.0",
72-
"wheel == 0.45.1",
73-
"cython == 3.1.6",
71+
"setuptools == 82.0.1",
72+
"wheel == 0.46.3",
73+
"cython == 3.2.4",
7474
"delocate == 0.13.0 ; platform_system=='Windows'",
7575
]
7676
docs = [
7777
"mkdocs==1.6.1",
78-
"mkdocstrings-python==1.18.2",
79-
"mkdocs-material==9.6.23",
80-
"pymdown-extensions==10.16.1",
81-
"mkdocs-gen-files==0.5.0",
82-
"mkdocs-literate-nav==0.6.2",
83-
"mkdocs-include-markdown-plugin==7.2.0",
84-
"griffe==1.14.0",
78+
"mkdocstrings-python==2.0.3",
79+
"mkdocs-material==9.7.6",
80+
"pymdown-extensions==10.21",
81+
"mkdocs-gen-files==0.6.1",
82+
"mkdocs-literate-nav==0.6.3",
83+
"mkdocs-include-markdown-plugin==7.2.1",
84+
"griffe==2.0.0",
8585
]
8686
dev = [
87-
"pre-commit==4.3.0",
88-
"ipython==9.6.0",
87+
"pre-commit==4.5.1",
88+
"ipython==9.11.0",
8989
"types-setuptools",
9090
"libzim[scripts]",
9191
"libzim[lint]",

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232

3333
class Config:
34-
libzim_dl_version: str = os.getenv("LIBZIM_DL_VERSION", "9.4.0-1")
34+
libzim_dl_version: str = os.getenv("LIBZIM_DL_VERSION", "9.5.1")
3535
use_system_libzim: bool = bool(os.getenv("USE_SYSTEM_LIBZIM") or False)
3636
download_libzim: bool = not bool(os.getenv("DONT_DOWNLOAD_LIBZIM") or False)
3737

tests/test_libzim_creator.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,7 @@ def get_creator_output(fpath, verbose):
157157
from libzim.writer import Creator
158158
with Creator(r"{fpath}").config_verbose({verbose}) as creator:
159159
pass
160-
""".replace(
161-
"{fpath}", str(fpath)
162-
).replace(
163-
"{verbose}", str(verbose)
164-
)
160+
""".replace("{fpath}", str(fpath)).replace("{verbose}", str(verbose))
165161

166162
# Build command with appropriate GIL settings for free-threaded Python
167163
cmd = [sys.executable]

tests/test_libzim_reader.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ def test_reader_get_random_entry(all_zims):
627627
@pytest.mark.parametrize(*parametrize_for(["filename"]))
628628
def test_cluster_cache(all_zims, filename):
629629
zim = Archive(all_zims / filename)
630-
default_value = 536870912 # 512M
630+
default_value = 16777216 # 16M
631631
new_value = 1024
632632

633633
assert get_cluster_cache_max_size() == default_value

0 commit comments

Comments
 (0)