Update build scripts across the board

.github/workflows/build_linux.yml

@@ -41,6 +41,9 @@ jobs:
     - name: Install package
       run: |
         pip install --verbose .
+      env: 
+        CC: clang
+        CXX: clang++
     - name: Test with pytest
       run: |
         python -m pytest tests/ --cov=primate --benchmark-skip

.github/workflows/build_macos.yml

@@ -28,9 +28,7 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Install Clang with OpenMP support
       run: |
-        rm -rf /usr/local/bin/2to3*
-        sudo chown -R $(whoami) /usr/local 
-        brew install --force libomp llvm > nul
+        brew install --force libomp llvm
     - name: Update environment flags for Clang 
       run: |
         export PATH="/usr/local/opt/llvm/bin:$PATH"
@@ -60,7 +58,7 @@ jobs:
         pip install --verbose .
       env:
         CC: /usr/local/opt/llvm/bin/clang
-        CXX: /usr/local/opt/llvm/bin/clang
+        CXX: /usr/local/opt/llvm/bin/clang++
     - name: Test with pytest
       run: |
         python -m pytest tests/ --cov=primate --benchmark-skip

.github/workflows/wheels.yml

@@ -19,7 +19,6 @@ jobs:
         # should also be able to do multi-archs on a single entry, e.g.
         # [os-image, os-name, os-arch]
         - [ubuntu-latest, manylinux, x86_64]
-        - [ubuntu-latest, musllinux, x86_64]
         - [macos-latest, macosx, x86_64]
         - [windows-latest, win, AMD64] 
         # os: [windows-latest]
@@ -44,6 +43,11 @@ jobs:
         run: |
           python -m pip install cibuildwheel
           
+      - name: Pre-run linux pre-build
+        if: runner.os == 'Linux'
+        run: | 
+          bash {project}/tools/cibw_linux.sh {project}
+        
       - name: Set VSDev RC (windows only)
         if: runner.os == 'Windows'
         run: | 

pyproject.toml

@@ -33,7 +33,7 @@ setup = ['--default-library=static']
 [tool.cibuildwheel]
 test-requires = ["pytest", "pytest-cov", "pytest-benchmark"] # coverage-badge
 test-command = ["coverage run --source={package} -m pytest {package}/tests", "coverage report -m"]
-build-verbosity = 1
+build-verbosity = 2
 skip = "cp36-* cp37-* *_ppc64le *_i686 *_s390x *-musllinux*" # todo: revisit musllinux
 
 [tool.cibuildwheel.macos]

tools/repair_windows.sh

@@ -3,6 +3,9 @@ set -xe
 WHEEL="$1"
 DEST_DIR="$2"
 
+## Need delvewheel for this 
+pip install delvewheel
+
 # create a temporary directory in the destination folder and unpack the wheel into there
 pushd $DEST_DIR
 mkdir -p tmp
@@ -17,7 +20,6 @@ pushd primate*
 # We therefore find each PYD in the directory structure and strip them.
 for f in $(find ./primate* -name '*.pyd'); do strip $f; done
 
-
 # now repack the wheel and overwrite the original
 wheel pack .
 mv -fv *.whl $WHEEL