Skip to content

Commit 41cd63a

Browse files
authored
Merge pull request FABLE-3DXRD#501 from t20100/update-release-ci
Update release workflow
2 parents 973ea99 + f06d240 commit 41cd63a

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

.github/workflows/release.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
cibw_archs: "auto64"
2828
#- os: windows-2019
2929
# cibw_archs: "auto32"
30-
- os: macos-13
30+
- os: macos-14
3131
cibw_archs: "universal2"
3232

3333
steps:
@@ -40,23 +40,27 @@ jobs:
4040
platforms: all
4141

4242
- name: Build wheels
43-
uses: pypa/cibuildwheel@v2.16.5
43+
uses: pypa/cibuildwheel@v3.0.0
4444
env:
4545
CIBW_BUILD_VERBOSITY: 1
4646
CIBW_PROJECT_REQUIRES_PYTHON: ">=3.8"
4747
CIBW_BUILD: cp38-* cp39-* cp310-* cp311-* cp312-* cp313-*
48-
# Do not build for pypy, muslinux and python3.12 on ppc64le
49-
CIBW_SKIP: pp* *-musllinux_* cp312-*linux_ppc64le cp313-*linux_ppc64le
48+
# Do not build for muslinux and python>=3.12 on ppc64le
49+
CIBW_SKIP: "*-musllinux_* cp312-*linux_ppc64le cp313-*linux_ppc64le"
5050
CIBW_ARCHS: ${{ matrix.cibw_archs }}
5151

5252
# Use silx wheelhouse: needed for ppc64le
5353
CIBW_ENVIRONMENT_LINUX: "PIP_FIND_LINKS=https://www.silx.org/pub/wheelhouse/ PIP_TRUSTED_HOST=www.silx.org"
5454

55+
# Build without isolation needed to use older wheels for ppc64le
56+
CIBW_BEFORE_BUILD: pip install setuptools wheel "numpy; python_version >= '3.9'" "oldest-supported-numpy; python_version < '3.9'" --only-binary numpy
57+
CIBW_BUILD_FRONTEND: "build; args: --no-isolation"
58+
5559
CIBW_BEFORE_TEST: "pip install --only-binary :all: fabio PyQt5 pyFAI"
5660
CIBW_TEST_EXTRAS: full
5761
CIBW_TEST_COMMAND: pytest {project}/test
58-
# Skip tests for 32bits and emulated architectures, arm64 macos and on Windows
59-
CIBW_TEST_SKIP: "*-*linux_i686 *-*linux_{aarch64,ppc64le,s390x} *-macosx_arm64 *-macosx_universal2:arm64 *-win32 *-win_amd64"
62+
# Skip tests for 32bits, emulated architectures, on Windows and on macos python313 (missing siphash wheel)
63+
CIBW_TEST_SKIP: "*-*linux_i686 *-*linux_{aarch64,ppc64le,s390x} *-win32 *-win_amd64 cp313-macosx_universal2"
6064

6165
- uses: actions/upload-artifact@v4
6266
with:

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
[build-system]
22
requires = ["setuptools",
3-
"six",
43
"wheel",
54
"numpy; python_version=='2.7'",
65
"oldest-supported-numpy; python_version >='3.0' and python_version <'3.9'",

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ def build_extension(self, ext):
140140
# sfood -I ImageD11/depreciated -I build/ -v -u >sfood.out 2>sfood.err
141141

142142
minimal = [ # can't compile without this
143-
"six",
144143
'numpy',
145144
"setuptools",
146145
]

0 commit comments

Comments
 (0)