rollback delvewheel

GUDHI · Apr 7, 2023 · 73b87f0 · 73b87f0
1 parent d520468
commit 73b87f0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git 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
@@ -27,19 +27,19 @@ 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: |
           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: |