From 73b87f022ca4b50f325ba50ffa5ed812ccf1b0e2 Mon Sep 17 00:00:00 2001 From: Vincent Rouvreau Date: Fri, 7 Apr 2023 17:37:09 +0200 Subject: [PATCH] rollback delvewheel --- .github/workflows/pip-build-windows.yml | 5 ++--- .github/workflows/pip-packaging-windows.yml | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pip-build-windows.yml b/.github/workflows/pip-build-windows.yml index 4e98df8746..bb3964247e 100644 --- a/.github/workflows/pip-build-windows.yml +++ b/.github/workflows/pip-build-windows.yml @@ -25,18 +25,17 @@ jobs: vcpkg version ls "C:\vcpkg\installed\x64-windows\bin\" python -m pip install --user -r .\ext\gudhi-deploy\build-requirements.txt - python -m pip install --user delvewheel - name: Build python wheel and install it run: | mkdir build cd ".\build\" cmake -DCMAKE_BUILD_TYPE=Release -DFORCE_EIGEN_DEFAULT_DENSE_INDEX_TYPE_TO_INT=ON -DCMAKE_TOOLCHAIN_FILE=c:\vcpkg\scripts\buildsystems\vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows .. cd ".\src\python\" + cp "C:\vcpkg\installed\x64-windows\bin\mpfr*.dll" ".\gudhi\" + cp "C:\vcpkg\installed\x64-windows\bin\gmp*.dll" ".\gudhi\" python -m build -n ls ".\dist\" cd ".\dist\" - Get-ChildItem *.whl | ForEach-Object{python -m delvewheel show $_.Name --add-path="C:\vcpkg\installed\x64-windows\bin\"} - Get-ChildItem *.whl | ForEach-Object{python -m delvewheel repair $_.Name --add-path="C:\vcpkg\installed\x64-windows\bin\"} Get-ChildItem *.whl | ForEach-Object{python -m pip install --user $_.Name} - name: Test python wheel run: | diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 9ec3708d6c..6259033d7f 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -27,7 +27,7 @@ jobs: vcpkg version ls "C:\vcpkg\installed\x64-windows\bin\" python -m pip install --user -r .\ext\gudhi-deploy\build-requirements.txt - python -m pip install --user delvewheel twine + python -m pip install --user twine python -m pip list - name: Build python wheel and install it run: | @@ -35,11 +35,11 @@ jobs: cd ".\build\" cmake -DCMAKE_BUILD_TYPE=Release -DFORCE_EIGEN_DEFAULT_DENSE_INDEX_TYPE_TO_INT=ON -DCMAKE_TOOLCHAIN_FILE=c:\vcpkg\scripts\buildsystems\vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows .. cd ".\src\python\" + cp "C:\vcpkg\installed\x64-windows\bin\mpfr*.dll" ".\gudhi\" + cp "C:\vcpkg\installed\x64-windows\bin\gmp*.dll" ".\gudhi\" python -m build -n ls ".\dist\" cd ".\dist\" - Get-ChildItem *.whl | ForEach-Object{python -m delvewheel show $_.Name --add-path="C:\vcpkg\installed\x64-windows\bin\"} - Get-ChildItem *.whl | ForEach-Object{python -m delvewheel repair $_.Name --add-path="C:\vcpkg\installed\x64-windows\bin\"} Get-ChildItem *.whl | ForEach-Object{python -m pip install --user $_.Name} - name: Test python wheel run: |