From aed42aac0f2a1ec4131ee24213a9ee43d9d9e1cf Mon Sep 17 00:00:00 2001 From: peekxc Date: Thu, 7 Dec 2023 12:23:32 -0500 Subject: [PATCH] windows build updates --- .github/workflows/build_windows.yml | 10 ++++------ tools/cibw_windows.sh | 7 +++++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index 56a3f2a..8fb12a2 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -67,7 +67,9 @@ jobs: coverage report -m - name: Build a wheel run: | - python -m build --wheel + python -m pip wheel --no-deps -w 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: Uninstall the package @@ -77,11 +79,7 @@ jobs: # python -m pip install $(find "$output_dir" -type f | grep *primate*.whl) # python -m pip install $env:wheel_name run: | - set PROJ_WHEEL=true - FOR %%F IN (dist\*.whl) DO (set PYPROJ_WHEEL=%%F) - delvewheel repair %PYPROJ_WHEEL% - FOR %%F IN (wheelhouse\*.whl) DO (set PYPROJ_WHEEL=%%F) - python -m pip install %PYPROJ_WHEEL% + python -m pip install 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 08fc35a..0023d6f 100644 --- a/tools/cibw_windows.sh +++ b/tools/cibw_windows.sh @@ -20,5 +20,8 @@ choco install rtools -y --no-progress --force --version=4.0.0.20220206 set PATH=C:\rtools40\ucrt64\bin\;%PATH% -Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1 -RefreshEnv.cmd +g++ --version + +# $env:ChocolateyInstall = Convert-Path "$((Get-Command choco).Path)\..\.." +# Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1" +# refreshenv