Skip to content

Commit 1b35792

Browse files
authored
Merge pull request #5072 from vicentebolea/fix-freethreaded-cp314t
ci: bump cibuildwheel to v4.0.0, drop cp313t free-threaded wheels
2 parents 6f0a6b7 + 827dd43 commit 1b35792

2 files changed

Lines changed: 10 additions & 13 deletions

File tree

.github/workflows/pypackaging.yml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
fetch-depth: 0
7575
- name: Generate common version file
7676
run: cmake -P scripts/ci/gh-actions/config/adios-version.cmake && echo VERSION.TXT
77-
- uses: pypa/cibuildwheel@8d2b08b68458a16aeb24b64e68a09ab1c8e82084 # v3.4.1
77+
- uses: pypa/cibuildwheel@f03ac7617d6cff873ccf24cc0d567ef5ba5a9e6d # v4.0.0
7878
env:
7979
CIBW_BEFORE_ALL: yum install -y libcurl-devel openssl-devel
8080
CIBW_BUILD: >-
@@ -98,7 +98,7 @@ jobs:
9898
fetch-depth: 0
9999
- name: Generate common version file
100100
run: cmake -P scripts/ci/gh-actions/config/adios-version.cmake && echo VERSION.TXT
101-
- uses: pypa/cibuildwheel@8d2b08b68458a16aeb24b64e68a09ab1c8e82084 # v3.4.1
101+
- uses: pypa/cibuildwheel@f03ac7617d6cff873ccf24cc0d567ef5ba5a9e6d # v4.0.0
102102
env:
103103
CIBW_BEFORE_ALL: yum install -y libcurl-devel openssl-devel
104104
# abi3 wheel valid for all CPython >= 3.12 (enabled via pyproject.toml override)
@@ -109,7 +109,7 @@ jobs:
109109
path: wheelhouse/*.whl
110110

111111
build_wheels_freethreaded:
112-
name: Wheels cp313t + cp314t
112+
name: Wheels cp314t
113113
runs-on: ubuntu-latest
114114
permissions:
115115
contents: read
@@ -120,16 +120,12 @@ jobs:
120120
fetch-depth: 0
121121
- name: Generate common version file
122122
run: cmake -P scripts/ci/gh-actions/config/adios-version.cmake && echo VERSION.TXT
123-
- uses: pypa/cibuildwheel@8d2b08b68458a16aeb24b64e68a09ab1c8e82084 # v3.4.1
123+
- uses: pypa/cibuildwheel@f03ac7617d6cff873ccf24cc0d567ef5ba5a9e6d # v4.0.0
124124
env:
125125
CIBW_BEFORE_ALL: yum install -y libcurl-devel openssl-devel
126-
# free-threaded and prerelease are both opt-in groups in cibuildwheel;
127-
# cp314t requires both since 3.14 is still prerelease
128-
CIBW_ENABLE: cpython-freethreading cpython-prerelease
129-
# free-threaded (no-GIL) wheels (enabled via pyproject.toml override)
130-
CIBW_BUILD: >-
131-
cp313t-manylinux_x86_64
132-
cp314t-manylinux_x86_64
126+
# cp314t free-threaded (no-GIL) wheel, enabled via pyproject.toml override.
127+
# cibuildwheel v4 dropped cp313t support; cp314t builds by default.
128+
CIBW_BUILD: cp314t-manylinux_x86_64
133129
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v4
134130
with:
135131
name: artifact_wheels_freethreaded

pyproject.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,12 @@ select = "cp312-*"
6262
config-settings."wheel.py-api" = "cp312"
6363
config-settings."cmake.define.ADIOS2_USE_PythonStableABI" = "ON"
6464

65-
# For free-threaded Python 3.13t enable the free-threaded (no-GIL) extension.
65+
# For free-threaded Python 3.14t enable the free-threaded (no-GIL) extension.
6666
# Note: Py_LIMITED_API (abi3) is incompatible with free-threaded builds, so a
6767
# separate wheel must be built for each future free-threaded Python version.
68+
# cibuildwheel v4 dropped support for the experimental cp313t builds.
6869
[[tool.cibuildwheel.overrides]]
69-
select = "cp313t-*"
70+
select = "cp314t-*"
7071
config-settings."cmake.define.ADIOS2_USE_PythonFreeThreaded" = "ON"
7172

7273
[tool.scikit-build]

0 commit comments

Comments
 (0)