cicd/lib-build-and-push: use cibuildwheel[uv]

Author: dkropachev

.github/workflows/build-push.yml

@@ -26,4 +26,4 @@ jobs:
     with:
       upload: ${{ github.event_name == 'push' && endsWith(github.event.ref, 'scylla') }}
       python-version: '3.13'
-      target: linux,macos,windows
+      target: windows

.github/workflows/integration-tests.yml

@@ -6,6 +6,9 @@ on:
       - master
       - 'branch-**'
   pull_request:
+    branches:
+      - master1
+      - 'branch-**'
     paths-ignore:
      - docs/*
      - examples/*

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

@@ -21,6 +21,9 @@ on:
         required: false
         default: "linux,macos,windows"
 
+env:
+  CIBW_ARCHS_WINDOWS: "AMD64"
+
 jobs:
   prepare-matrix:
     name: "Prepare matrix to run for ${{ inputs.python-version }} on `${{ inputs.target }}`"
@@ -78,7 +81,7 @@ jobs:
 
       - name: Install cibuildwheel
         run: |
-          python3 -m pip install cibuildwheel==2.22.0
+          python3 -m pip install cibuildwheel[uv]==2.22.0
 
       - name: Install OpenSSL for Windows
         if: runner.os == 'Windows'
@@ -112,7 +115,43 @@ jobs:
             echo "Enforcing target deployment for 14.0"
           fi
 
+#      - name: Add clang path to $PATH env
+#        if: runner.os == 'Windows'
+#        run: echo "C:\msys64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
+      - name: Add clang path to $PATH env
+        if: runner.os == 'Windows'
+        run: |
+          echo "CC=clang" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          echo "CXX=clang++" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
+      - name: Check Clang Version
+        run: clang --version
+
+      - name: Force Clang for Compilation
+        run: |
+          echo "[build]" >> $HOME/.pydistutils.cfg
+          echo "compiler=clang" >> $HOME/.pydistutils.cfg
+
+      - name: Ensure cl.exe is Removed
+        run: |
+          cl.exe --version
+
+      - name: Build wheels for windows
+        if: runner.os == 'Windows'
+        run: |
+          $envPath = $env:Path
+          echo $envPath
+          $pathArray = $envPath -split ";"
+          $filteredPaths = $pathArray | Where-Object { $_ -notmatch "Microsoft Visual Studio" }
+          $newPath = ($filteredPaths -join ";").TrimEnd(";")
+          echo $newPath
+          $env:Path = $newPath
+          [System.Environment]::SetEnvironmentVariable("Path", $newPath, "User")
+          python3 -m cibuildwheel --output-dir wheelhouse
+
       - name: Build wheels
+        if: runner.os != 'Windows'
         run: |
           python3 -m cibuildwheel --output-dir wheelhouse
 
@@ -168,7 +207,7 @@ jobs:
 
       - name: Install cibuildwheel
         run: |
-          python -m pip install cibuildwheel==2.22.0
+          python -m pip install cibuildwheel[uv]==2.22.0
 
       - name: Build wheels
         env:

pyproject.toml

@@ -87,10 +87,12 @@ tag_regex = '(?P<version>\d*?\.\d*?\.\d*?)-scylla'
 #### CI BUILDWHEEL CONFIG ####
 
 [tool.cibuildwheel]
-
 build-frontend = "build[uv]"
+
 environment = { CASS_DRIVER_BUILD_CONCURRENCY = "2", CASS_DRIVER_BUILD_EXTENSIONS_ARE_MUST = "yes", CFLAGS = "-g0 -O3" }
+
 skip = ["cp2*", "cp36*", "pp36*", "cp37*", "pp37*", "*i686", "*musllinux*"]
+build = ["cp3*"]
 
 before-test = "pip install -r {project}/test-requirements.txt"
 
@@ -100,7 +102,6 @@ manylinux-pypy_x86_64-image = "manylinux_2_28"
 manylinux-pypy_aarch64-image = "manylinux_2_28"
 
 [tool.cibuildwheel.linux]
-build = ["cp3*_x86_64"]
 
 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"
 test-command = [
@@ -110,18 +111,18 @@ test-command = [
 
 [tool.cibuildwheel.macos]
 build = ["cp3*"]
+build-frontend = "build"
 test-command = [
     "pytest {project}/tests/unit -k 'not (test_multi_timer_validation or test_empty_connections or test_timer_cancellation)'"
 ]
 
 [tool.cibuildwheel.windows]
-build = ["cp3*"]
-build-frontend = "build" # build[uv] seems to be broken on Windows
+build-frontend = "build[uv]" # build[uv] seems to be broken on Windows
 test-command = [
-    "pytest {project}/tests/unit  -k 'not (test_deserialize_date_range_year or test_datetype or test_libevreactor)'"
+    "pytest {project}/tests/unit  -k \"not (test_deserialize_date_range_year or test_datetype or test_libevreactor)\""
 ]
 
-environment = { CASS_DRIVER_BUILD_CONCURRENCY = "2", CASS_DRIVER_BUILD_EXTENSIONS_ARE_MUST = "yes", CFLAGS = "-g0 -O3", CC = "clang", CXX = "clang++" }
+environment = { CASS_DRIVER_BUILD_CONCURRENCY = "2", CASS_DRIVER_BUILD_EXTENSIONS_ARE_MUST = "yes", CC = "clang", CXX = "clang++" }
 
 [[tool.cibuildwheel.overrides]]
 select = "pp*"

setup.py

@@ -453,9 +453,7 @@ def run_setup(extensions):
         else:
             sys.stderr.write("Bypassing Cython setup requirement\n")
 
-    setup(
-        tests_require=['nose', 'mock>=2.0.0', 'PyYAML', 'pytz', 'sure'],
-        **kw)
+    setup(**kw)
 
 
 run_setup(None)