Skip to content

Commit 7021f3e

Browse files
committed
Upgrading to cibuildwheel 3
1 parent aab90f8 commit 7021f3e

File tree

3 files changed

+25
-24
lines changed

3 files changed

+25
-24
lines changed

.github/workflows/wheels.yml

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
python3 -c "import pathlib,glob;pathlib.Path('GITHUB_ENV').write_text('SDIST_PATH' + glob.glob('dist/*.tar.gz')[0])"
2323
2424
- name: Build wheels
25-
uses: pypa/cibuildwheel@v2.23.3
25+
uses: pypa/cibuildwheel@v3.0.0
2626
env:
2727
CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* cp313-* pp310-* pp311-*"
28-
CIBW_TEST_COMMAND: "python -m pymunk.tests"
28+
# CIBW_TEST_COMMAND: "python -m pymunk.tests"
2929
# CIBW_BUILD_VERBOSITY: 3
3030
with:
3131
package-dir: "$SDIST_PATH"
@@ -55,11 +55,9 @@ jobs:
5555
- uses: actions/checkout@v4
5656
with:
5757
submodules: true
58-
- uses: pypa/cibuildwheel@v2.23.3
58+
- uses: pypa/cibuildwheel@v3.0.0
5959
env:
6060
CIBW_PLATFORM: pyodide
61-
PYMUNK_BUILD_SLIM: 1
62-
CIBW_TEST_COMMAND: "python -m pymunk.tests"
6361
- uses: actions/upload-artifact@v4
6462
if: ${{ github.ref == 'refs/heads/master' }}
6563
with:
@@ -73,34 +71,21 @@ jobs:
7371
- name: Checkout
7472
uses: actions/checkout@v4
7573
with:
76-
submodules: true
77-
- name: Set up Python
78-
uses: actions/setup-python@v5
79-
with:
80-
python-version: "3.x"
81-
- name: Install cibuildwheel
82-
run: |
83-
python -m pip install -U pip
84-
# Use main branch until iOS support is released.
85-
# python -m pip install cibuildwheel==3.0.0
86-
python -m pip install git+https://github.com/pypa/cibuildwheel.git
87-
74+
submodules: true
75+
- run: brew upgrade cmake
8876
- name: Build wheels
89-
run: python -m cibuildwheel
77+
uses: pypa/[email protected]
78+
9079
env:
91-
IPHONEOS_DEPLOYMENT_TARGET: "12.0"
9280
CIBW_PLATFORM: ios
93-
CIBW_ARCHS: auto
81+
CIBW_ARCHS: all
9482
CIBW_BUILD_VERBOSITY: 1
9583
CIBW_BEFORE_BUILD_IOS: |
9684
# download wheel and pretend that it's compatible with the current platform settings
9785
curl https://files.pythonhosted.org/packages/8b/f1/672d303ddf17c24fc83afd712316fda78dc6fce1cd53011b839483e1ecc8/cffi-1.17.1-cp313-cp313-macosx_11_0_arm64.whl -L -o cffi-1.17.1-py3-none-any.whl && \
9886
pip install cffi-1.17.1-py3-none-any.whl && \
9987
# install the rest of the dependencies
10088
python -m pip install setuptools wheel
101-
CIBW_XBUILD_TOOLS: "curl pkg-config tar"
102-
CIBW_BUILD_FRONTEND: "pip; args: --no-build-isolation"
103-
PYMUNK_BUILD_SLIM: 1
10489
10590
- uses: actions/upload-artifact@v4
10691
if: ${{ github.ref == 'refs/heads/master' }}

pyproject.toml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,3 +88,19 @@ module = "pymunk.util"
8888
# This is not typed
8989
disallow_untyped_defs = false
9090
check_untyped_defs = false
91+
92+
[tool.cibuildwheel]
93+
test-command = "python -m pymunk.tests"
94+
95+
[tool.cibuildwheel.linux]
96+
97+
[tool.cibuildwheel.macos]
98+
99+
[tool.cibuildwheel.windows]
100+
101+
[tool.cibuildwheel.ios]
102+
env = "PYMUNK_BUILD_SLIM: 1"
103+
104+
105+
[tool.cibuildwheel.pyodide]
106+
env = "PYMUNK_BUILD_SLIM: 1"

0 commit comments

Comments
 (0)