1

Author: dkropachev

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

@@ -21,9 +21,6 @@ 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 }}`"
@@ -86,7 +83,8 @@ jobs:
       - name: Install OpenSSL for Windows
         if: runner.os == 'Windows'
         run: |
-          choco install openssl --version=3.4.1 -f -y
+          choco install openssl --version=3.4.1 -f -y --no-progress
+          choco install llvm -y --no-progress
 
       - name: Install Conan
         if: runner.os == 'Windows'
@@ -115,45 +113,34 @@ 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: Show clang-cl version
+        run: clang-cl --version
 
-      - name: Ensure cl.exe is Removed
+      - name: Add clang to PATH
+        shell: pwsh
         run: |
-          cl.exe --version
+          echo "C:\Program Files\LLVM\bin" >> $Env:GITHUB_PATH
 
-      - name: Build wheels for windows
-        if: runner.os == 'Windows'
+      - name: Build wheels
+        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'
+        if: runner.os == 'Windows'
         run: |
-          python3 -m cibuildwheel --output-dir wheelhouse
+          python3 -m cibuildwheel --output-dir wheelhouse --platform windows
+        env:
+          CIBW_ENVIRONMENT_WINDOWS: 'CC=clang-cl CXX=clang-cl DISTUTILS_USE_SDK=1 LDSHARED="clang -shared" ARFLAGS=rcs AR=llvm-ar CFLAGS="/nologo /O2 /W3 /DNDEBUG /D_CRT_SECURE_NO_WARNINGS /MD" CXXFLAGS="/nologo /O2 /W3 /DNDEBUG /D_CRT_SECURE_NO_WARNINGS /EHsc /MD /std:c++17" '
+          CC: clang-cl
+          CXX: clang-cl
+          DISTUTILS_USE_SDK: 1
+          CIBW_BUILD_VERBOSITY: 3
+          LDSHARED: clang -shared
+          ARFLAGS: rcs
+          AR: llvm-ar
+          CFLAGS: /nologo /O2 /W3 /DNDEBUG /D_CRT_SECURE_NO_WARNINGS /MD
+          CXXFLAGS: /nologo /O2 /W3 /DNDEBUG /D_CRT_SECURE_NO_WARNINGS /EHsc /MD /std:c++17
 
       - uses: actions/upload-artifact@v4
         with:
@@ -227,9 +214,6 @@ jobs:
     permissions:
       id-token: write
 
-    # upload to PyPI on every tag starting with 'v'
-    # alternatively, to publish when a GitHub Release is created, use the following rule:
-    # if: github.event_name == 'release' && github.event.action == 'published'
     steps:
       - uses: actions/download-artifact@v4
         with:

pyproject.toml

@@ -122,7 +122,7 @@ test-command = [
     "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", CC = "clang", CXX = "clang++" }
+environment = { CASS_DRIVER_BUILD_CONCURRENCY = "2", CASS_DRIVER_BUILD_EXTENSIONS_ARE_MUST = "yes", CC = "clang-cl",  CXX = "clang-cl" }
 
 [[tool.cibuildwheel.overrides]]
 select = "pp*"

setup.py

@@ -14,24 +14,22 @@
 
 from __future__ import print_function
 
-import fnmatch
 import os
 import shutil
 import sys
 import json
 import warnings
 from pathlib import Path
-from sysconfig import get_config_vars
 
-if __name__ == '__main__' and sys.argv[1] == "gevent_nosetests":
-    print("Running gevent tests")
-    from gevent.monkey import patch_all
-    patch_all()
-
-if __name__ == '__main__' and sys.argv[1] == "eventlet_nosetests":
-    print("Running eventlet tests")
-    from eventlet import monkey_patch
-    monkey_patch()
+if __name__ == '__main__' and len(sys.argv) > 1:
+    if sys.argv[1] == "gevent_nosetests":
+        print("Running gevent tests")
+        from gevent.monkey import patch_all
+        patch_all()
+    elif sys.argv[1] == "eventlet_nosetests":
+        print("Running eventlet tests")
+        from eventlet import monkey_patch
+        monkey_patch()
 
 from setuptools.command.build_ext import build_ext
 from setuptools import Extension, Command, setup
@@ -57,7 +55,7 @@ class eventlet_nosetests(nosetests):
         description = "run nosetests with eventlet monkey patching"
 
 has_cqlengine = False
-if __name__ == '__main__' and sys.argv[1] == "install":
+if __name__ == '__main__' and len(sys.argv) > 1 and sys.argv[1] == "install":
     try:
         import cqlengine
         has_cqlengine = True
@@ -300,6 +298,8 @@ class build_extensions(build_ext):
     """
 
     def run(self):
+        if sys.platform.startswith('win'):
+            self.compiler = 'unix'
         try:
             self._setup_extensions()
             build_ext.run(self)