Skip to content

Commit 37c8929

Browse files
committed
1
1 parent 95e0180 commit 37c8929

File tree

2 files changed

+19
-11
lines changed

2 files changed

+19
-11
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ 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* cp37* cp38* *i686 *musllinux*" >> $GITHUB_ENV;
101+
echo "CIBW_SKIP=cp38* *i686 *musllinux*" >> $GITHUB_ENV;
102102
echo "CIBW_BUILD=cp3*" >> $GITHUB_ENV;
103103
echo "CIBW_BEFORE_TEST=true" >> $GITHUB_ENV;
104104
echo "CIBW_BEFORE_TEST_WINDOWS=(exit 0)" >> $GITHUB_ENV;

pyproject.toml

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,7 @@ tag_regex = '(?P<version>\d*?\.\d*?\.\d*?)-scylla'
128128

129129
[tool.cibuildwheel]
130130
build-frontend = "build[uv]"
131-
environment = { CASS_DRIVER_BUILD_CONCURRENCY = "2", CASS_DRIVER_BUILD_EXTENSIONS_ARE_MUST = "yes", CFLAGS = "-g0 -O3" }
132131
skip = [
133-
"cp2*",
134-
"cp36*",
135-
"cp37*",
136132
"cp38*",
137133
"*i686",
138134
"*musllinux*",
@@ -145,25 +141,37 @@ manylinux-aarch64-image = "manylinux_2_28"
145141
manylinux-pypy_x86_64-image = "manylinux_2_28"
146142
manylinux-pypy_aarch64-image = "manylinux_2_28"
147143

148-
[tool.cibuildwheel.linux]
144+
environment-pass = ["CFLAGS", "CPPFLAGS", "LDFLAGS", "ARCHFLAGS", "CC", "CXX", "CL"]
145+
146+
[tool.cibuildwheel.environment]
147+
CASS_DRIVER_BUILD_CONCURRENCY = "2"
148+
CASS_DRIVER_BUILD_EXTENSIONS_ARE_MUST = "yes"
149+
CFLAGS = "${CFLAGS:-} -O3 -fwrapv -fno-strict-overflow -Wno-unused-result -Wsign-compare -DNDEBUG"
150+
LDFLAGS = "${LDFLAGS:-}"
149151

152+
[tool.cibuildwheel.linux]
150153
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"
151154
test-command = [
152-
"pytest {package}/tests/unit",
153-
"EVENT_LOOP_MANAGER=gevent pytest {package}/tests/unit/io/test_geventreactor.py",
155+
"pytest {project}/tests/unit",
156+
"EVENT_LOOP_MANAGER=gevent pytest {project}/tests/unit/io/test_geventreactor.py",
154157
]
155158

156159
[tool.cibuildwheel.macos]
157160
build-frontend = "build"
158161
test-command = [
159-
"pytest {project}/tests/unit -k 'not (test_multi_timer_validation or test_empty_connections or test_timer_cancellation)'",
162+
"pytest {project}/tests/unit -k 'not (test_multi_timer_validation or test_empty_connections or test_timer_cancellation)'",
160163
]
161164

162165
[tool.cibuildwheel.windows]
163166
build-frontend = "build"
164167
test-command = [
165-
"pytest {project}/tests/unit -k \"not (test_deserialize_date_range_year or test_datetype or test_libevreactor)\"",
168+
"pytest {project}/tests/unit -k \"not (test_deserialize_date_range_year or test_datetype or test_libevreactor)\"",
166169
]
167170

171+
[tool.cibuildwheel.windows.environment]
172+
CASS_DRIVER_BUILD_CONCURRENCY = "2"
168173
# TODO: set CASS_DRIVER_BUILD_EXTENSIONS_ARE_MUST to yes when https://github.com/scylladb/python-driver/issues/429 is fixed
169-
environment = { CASS_DRIVER_BUILD_CONCURRENCY = "2", CASS_DRIVER_BUILD_EXTENSIONS_ARE_MUST = "no" }
174+
CASS_DRIVER_BUILD_EXTENSIONS_ARE_MUST = "no"
175+
CFLAGS = "${CFLAGS:-} /O2 /MD /DNDEBUG /utf-8 /W3 /EHsc /Zc:inline"
176+
CL = "${CL:-} /O2 /MD /DNDEBUG /utf-8 /W3 /EHsc /Zc:inline"
177+
LDFLAGS = "${LDFLAGS:-} /OPT:REF /OPT:ICF"

0 commit comments

Comments
 (0)