From 065640c9a8b37b33e15baf6c19ab2e87965c13ae Mon Sep 17 00:00:00 2001
From: peekxc <matt.piekenbrock@gmail.com>
Date: Fri, 8 Dec 2023 00:54:12 -0500
Subject: [PATCH] delvewheel changes

---
 .github/workflows/build_windows.yml | 10 +++++++---
 tools/cibw_windows.sh               |  3 +++
 tools/repair_windows.sh             |  4 ++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index 0e6f6ee..e72c088 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -67,14 +67,16 @@ jobs:
         coverage report -m
     - name: Build a wheel
       run: |
-        python -m pip wheel --no-deps --only-binary --wheel-dir $GITHUB_WORKSPACE/wheelhouse .
+        python -m pip wheel . --no-deps --wheel-dir dist 
+        # $GITHUB_WORKSPACE/wheelhouse .
         # delvewheel repair -w dist -v wheelhouse/*.whl
         # python -m build --wheel
         # $env:wheel_name=Get-ChildItem -Path dist/* -Include *.whl
         # delvewheel repair -w dist $env:wheel_name
     - name: Repair the wheel
       run: |
-        bash tools/repair_windows.sh
+        delvewheel repair dist/*.whl
+        # bash tools/repair_windows.sh
     
     - name: Uninstall the package 
       run: | 
@@ -83,7 +85,9 @@ jobs:
       # python -m pip install $(find "$output_dir" -type f | grep *primate*.whl)
       # python -m pip install $env:wheel_name
       run: | 
-        # python -m pip install dist/*.whl
+        python -m pip install dist/*.whl
+        pip install delvewheel
+        delvewheel repair dist/*.whl
     - name: Wheel dry-run 
       run: | 
         python -c "import primate; print(primate.__version__)"
diff --git a/tools/cibw_windows.sh b/tools/cibw_windows.sh
index 3b4672c..be14119 100644
--- a/tools/cibw_windows.sh
+++ b/tools/cibw_windows.sh
@@ -26,6 +26,9 @@ export PATH=$PATH:/c:/rtools40/ucrt64/bin:$PATH
 # set PATH=C:\rtools40\ucrt64\bin\;%PATH%
 g++ --version
 
+# Create a a set commands to install mingw64 on windows-2019 server for compiling native Python extension modules 
+
+
 # $env:ChocolateyInstall = Convert-Path "$((Get-Command choco).Path)\..\.."   
 # Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
 # refreshenv
diff --git a/tools/repair_windows.sh b/tools/repair_windows.sh
index ed71cbb..90fa846 100644
--- a/tools/repair_windows.sh
+++ b/tools/repair_windows.sh
@@ -1,7 +1,7 @@
 set -xe
 
-WHEELDIR=$GITHUB_WORKSPACE/wheelhouse
-WHEELNAME=$(find "$WHEELDIR" -type f | grep *primate*.whl)
+# WHEELDIR=$GITHUB_WORKSPACE/wheelhouse
+# WHEELNAME=$(find "$WHEELDIR" -type f | grep *primate*.whl)
 
 # strip .local/bin/*.dll