Skip to content

Commit d78194f

Browse files
authored
Merge pull request #218 from openzim/armbuild
Upgrade cibuildwheel to fix arm build
2 parents 89af67a + fd5ea2b commit d78194f

File tree

7 files changed

+22
-22
lines changed

7 files changed

+22
-22
lines changed

.github/workflows/CI-wheels.yaml

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

3333
- name: Build wheels
34-
uses: pypa/cibuildwheel@v2.20
34+
uses: pypa/cibuildwheel@v2.22
3535

3636
- uses: actions/upload-artifact@v4
3737
with:

.github/workflows/Publish.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
security unlock-keychain -p mysecretpassword ${APPLE_SIGNING_KEYCHAIN_PATH}
6969
7070
- name: Build wheels
71-
uses: pypa/cibuildwheel@v2.20
71+
uses: pypa/cibuildwheel@v2.22
7272

7373
- name: Cleanup Apple Keychain
7474
if: matrix.os == 'macos-13'

.github/workflows/QA.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@ env:
77

88
jobs:
99
lint:
10-
runs-on: ubuntu-22.04
10+
runs-on: ubuntu-24.04
1111
steps:
1212
- uses: actions/checkout@v4
1313

1414
- name: Set up Python
1515
uses: actions/setup-python@v5
1616
with:
17-
# to update to 3.13 once it lands in GH image
18-
python-version: "3.12"
17+
python-version: "3.13"
1918
architecture: x64
2019

2120
- name: Install dependencies (and project)

.github/workflows/Tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ${{ matrix.os }}
1313
strategy:
1414
matrix:
15-
os: [macos-13, windows-2022, ubuntu-22.04]
15+
os: [macos-13, windows-2022, ubuntu-24.04]
1616
python: ["3.9", "3.10", "3.11", "3.12", "3.13"]
1717

1818
steps:
@@ -38,7 +38,7 @@ jobs:
3838
run: inv coverage --args "-vvv"
3939

4040
- name: Upload coverage report to codecov
41-
if: matrix.os == 'ubuntu-22.04' && matrix.python == '3.11'
41+
if: matrix.os == 'ubuntu-24.04' && matrix.python == '3.13'
4242
uses: codecov/codecov-action@v4
4343
with:
4444
fail_ci_if_error: true

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ repos:
77
- id: trailing-whitespace
88
- id: end-of-file-fixer
99
- repo: https://github.com/psf/black
10-
rev: "24.8.0"
10+
rev: "25.1.0"
1111
hooks:
1212
- id: black
1313
- repo: https://github.com/astral-sh/ruff-pre-commit
14-
rev: v0.6.3
14+
rev: v0.9.5
1515
hooks:
1616
- id: ruff
1717
- repo: https://github.com/RobertCraigie/pyright-python
18-
rev: v1.1.381
18+
rev: v1.1.393
1919
hooks:
2020
- id: pyright
2121
name: pyright (system)

.readthedocs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ version: 2
66
build:
77
os: ubuntu-24.04
88
tools:
9-
python: '3.12'
9+
python: '3.13'
1010

1111
# custom commands to run mkdocs build within hatch, as suggested by maintainer in
1212
# https://github.com/readthedocs/readthedocs.org/issues/10706

pyproject.toml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ requires = [
33
"setuptools == 74.1.1",
44
"wheel == 0.44.0",
55
"cython == 3.0.11",
6-
"delocate == 0.11.0 ; platform_system=='Windows'",
6+
# https://github.com/pypa/cibuildwheel/blob/v2.22/cibuildwheel/resources/constraints.txt
7+
"delocate == 0.12.0 ; platform_system=='Windows'",
78
]
89
build-backend = "setuptools.build_meta"
910

@@ -49,29 +50,29 @@ scripts = [
4950
"invoke==2.2.0",
5051
]
5152
lint = [
52-
"black==24.10.0",
53-
"ruff==0.6.9",
53+
"black==25.1.0",
54+
"ruff==0.9.5",
5455
"libzim",
5556
"libzim[build]",
5657
]
5758
check = [
58-
"pyright==1.1.384",
59+
"pyright==1.1.393",
5960
"libzim",
6061
"libzim[build]",
6162
"libzim[test]",
6263
"types-setuptools",
6364
]
6465
test = [
65-
"pytest==8.3.3",
66-
"coverage==7.6.2",
66+
"pytest==8.3.4",
67+
"coverage==7.6.10",
6768
# for cython coverage plugin
6869
"libzim[build]",
6970
]
7071
build = [
71-
"setuptools == 75.1.0",
72-
"wheel == 0.44.0",
72+
"setuptools == 75.8.0",
73+
"wheel == 0.45.1",
7374
"cython == 3.0.11",
74-
"delocate == 0.11.0 ; platform_system=='Windows'",
75+
"delocate == 0.12.0 ; platform_system=='Windows'",
7576
]
7677
docs = [
7778
"mkdocs==1.6.1",
@@ -84,8 +85,8 @@ docs = [
8485
"griffe==1.5.6",
8586
]
8687
dev = [
87-
"pre-commit==4.0.1",
88-
"ipython==8.28.0",
88+
"pre-commit==4.1.0",
89+
"ipython==8.32.0",
8990
"types-setuptools",
9091
"libzim[scripts]",
9192
"libzim[lint]",

0 commit comments

Comments
 (0)