Skip to content

Commit

Permalink
Merge pull request #218 from openzim/armbuild
Browse files Browse the repository at this point in the history
Upgrade cibuildwheel to fix arm build
  • Loading branch information
rgaudin authored Feb 12, 2025
2 parents 89af67a + fd5ea2b commit d78194f
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/CI-wheels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
platforms: all

- name: Build wheels
uses: pypa/cibuildwheel@v2.20
uses: pypa/cibuildwheel@v2.22

- uses: actions/upload-artifact@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/Publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
security unlock-keychain -p mysecretpassword ${APPLE_SIGNING_KEYCHAIN_PATH}
- name: Build wheels
uses: pypa/cibuildwheel@v2.20
uses: pypa/cibuildwheel@v2.22

- name: Cleanup Apple Keychain
if: matrix.os == 'macos-13'
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/QA.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,14 @@ env:

jobs:
lint:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v5
with:
# to update to 3.13 once it lands in GH image
python-version: "3.12"
python-version: "3.13"
architecture: x64

- name: Install dependencies (and project)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/Tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-13, windows-2022, ubuntu-22.04]
os: [macos-13, windows-2022, ubuntu-24.04]
python: ["3.9", "3.10", "3.11", "3.12", "3.13"]

steps:
Expand All @@ -38,7 +38,7 @@ jobs:
run: inv coverage --args "-vvv"

- name: Upload coverage report to codecov
if: matrix.os == 'ubuntu-22.04' && matrix.python == '3.11'
if: matrix.os == 'ubuntu-24.04' && matrix.python == '3.13'
uses: codecov/codecov-action@v4
with:
fail_ci_if_error: true
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ repos:
- id: trailing-whitespace
- id: end-of-file-fixer
- repo: https://github.com/psf/black
rev: "24.8.0"
rev: "25.1.0"
hooks:
- id: black
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.6.3
rev: v0.9.5
hooks:
- id: ruff
- repo: https://github.com/RobertCraigie/pyright-python
rev: v1.1.381
rev: v1.1.393
hooks:
- id: pyright
name: pyright (system)
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version: 2
build:
os: ubuntu-24.04
tools:
python: '3.12'
python: '3.13'

# custom commands to run mkdocs build within hatch, as suggested by maintainer in
# https://github.com/readthedocs/readthedocs.org/issues/10706
Expand Down
23 changes: 12 additions & 11 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ requires = [
"setuptools == 74.1.1",
"wheel == 0.44.0",
"cython == 3.0.11",
"delocate == 0.11.0 ; platform_system=='Windows'",
# https://github.com/pypa/cibuildwheel/blob/v2.22/cibuildwheel/resources/constraints.txt
"delocate == 0.12.0 ; platform_system=='Windows'",
]
build-backend = "setuptools.build_meta"

Expand Down Expand Up @@ -49,29 +50,29 @@ scripts = [
"invoke==2.2.0",
]
lint = [
"black==24.10.0",
"ruff==0.6.9",
"black==25.1.0",
"ruff==0.9.5",
"libzim",
"libzim[build]",
]
check = [
"pyright==1.1.384",
"pyright==1.1.393",
"libzim",
"libzim[build]",
"libzim[test]",
"types-setuptools",
]
test = [
"pytest==8.3.3",
"coverage==7.6.2",
"pytest==8.3.4",
"coverage==7.6.10",
# for cython coverage plugin
"libzim[build]",
]
build = [
"setuptools == 75.1.0",
"wheel == 0.44.0",
"setuptools == 75.8.0",
"wheel == 0.45.1",
"cython == 3.0.11",
"delocate == 0.11.0 ; platform_system=='Windows'",
"delocate == 0.12.0 ; platform_system=='Windows'",
]
docs = [
"mkdocs==1.6.1",
Expand All @@ -84,8 +85,8 @@ docs = [
"griffe==1.5.6",
]
dev = [
"pre-commit==4.0.1",
"ipython==8.28.0",
"pre-commit==4.1.0",
"ipython==8.32.0",
"types-setuptools",
"libzim[scripts]",
"libzim[lint]",
Expand Down

0 comments on commit d78194f

Please sign in to comment.