Skip to content

Commit 38816d8

Browse files
committed
Update cibuildwheel to 3.2.1
New version does not support pypy wheels, so just remove them. Also new version does not support cp2* cp36* and cp37* builds anymore, so we can safely drop them. Exclude building freethreaded python wheels.
1 parent 377777e commit 38816d8

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

.github/workflows/lib-build-and-push.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,6 @@ jobs:
9898
echo "CIBW_TEST_COMMAND=true" >> $GITHUB_ENV;
9999
echo "CIBW_TEST_COMMAND_WINDOWS=(exit 0)" >> $GITHUB_ENV;
100100
echo "CIBW_TEST_SKIP=*" >> $GITHUB_ENV;
101-
echo "CIBW_SKIP=cp2* cp36* pp36* cp37* pp37* cp38* pp38* cp39* pp39* *i686 *musllinux*" >> $GITHUB_ENV;
102-
echo "CIBW_BUILD=cp3* pp3*" >> $GITHUB_ENV;
103101
echo "CIBW_BEFORE_TEST=true" >> $GITHUB_ENV;
104102
echo "CIBW_BEFORE_TEST_WINDOWS=(exit 0)" >> $GITHUB_ENV;
105103
@@ -110,7 +108,7 @@ jobs:
110108

111109
- name: Install cibuildwheel
112110
run: |
113-
uv tool install 'cibuildwheel==2.22.0'
111+
uv tool install 'cibuildwheel==3.2.1'
114112
115113
- name: Install OpenSSL for Windows
116114
if: runner.os == 'Windows'
@@ -127,7 +125,7 @@ jobs:
127125
conan profile detect
128126
conan install conanfile.py
129127
130-
- name: Install OpenSSL for MacOS
128+
- name: Install libev for MacOS
131129
if: runner.os == 'MacOs'
132130
run: |
133131
brew install libev

pyproject.toml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -129,15 +129,12 @@ tag_regex = '(?P<version>\d*?\.\d*?\.\d*?)-scylla'
129129
build-frontend = "build[uv]"
130130
environment = { CASS_DRIVER_BUILD_CONCURRENCY = "2", CASS_DRIVER_BUILD_EXTENSIONS_ARE_MUST = "yes", CFLAGS = "-g0 -O3" }
131131
skip = [
132-
"cp2*",
133-
"cp36*",
134-
"pp36*",
135-
"cp37*",
136-
"pp37*",
137132
"cp38*",
138133
"pp38*",
139134
"cp39*",
140135
"pp39*",
136+
"cp3*t-*",
137+
"pp3*t-*",
141138
"*i686",
142139
"*musllinux*",
143140
]
@@ -149,6 +146,7 @@ manylinux-aarch64-image = "manylinux_2_28"
149146
manylinux-pypy_x86_64-image = "manylinux_2_28"
150147
manylinux-pypy_aarch64-image = "manylinux_2_28"
151148

149+
enable = ["pypy"]
152150
[tool.cibuildwheel.linux]
153151

154152
before-build = "rm -rf ~/.pyxbld && rpm --import https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux && yum install -y libffi-devel libev libev-devel openssl openssl-devel"
@@ -171,7 +169,3 @@ test-command = [
171169

172170
# TODO: set CASS_DRIVER_BUILD_EXTENSIONS_ARE_MUST to yes when https://github.com/scylladb/python-driver/issues/429 is fixed
173171
environment = { CASS_DRIVER_BUILD_CONCURRENCY = "2", CASS_DRIVER_BUILD_EXTENSIONS_ARE_MUST = "no" }
174-
175-
[[tool.cibuildwheel.overrides]]
176-
select = "pp*"
177-
test-command = []

0 commit comments

Comments
 (0)