summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Rouvreau <vincent.rouvreau@inria.fr>2023-01-10 19:29:04 +0100
committerVincent Rouvreau <vincent.rouvreau@inria.fr>2023-01-10 19:29:04 +0100
commit14a0e7bc0a89ab5d576c39ffd596843608fbf1dc (patch)
tree35d5b22e0046824975beb403945bb45294314932
parent2ee42848aba062b891c133eb358d6b105fa5bc67 (diff)
Remove delvewheel
-rw-r--r--.github/workflows/pip-build-windows.yml6
-rw-r--r--.github/workflows/pip-packaging-windows.yml6
2 files changed, 8 insertions, 4 deletions
diff --git a/.github/workflows/pip-build-windows.yml b/.github/workflows/pip-build-windows.yml
index 4455e6af..02617e31 100644
--- a/.github/workflows/pip-build-windows.yml
+++ b/.github/workflows/pip-build-windows.yml
@@ -25,17 +25,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 build delvewheel
+ python -m pip install --user build
- 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{delvewheel show $_.Name; delvewheel repair $_.Name; python -m pip install --user $_.Name}
+ Get-ChildItem *.whl | ForEach-Object{python -m pip install --user $_.Name}
- name: Test python wheel
run: |
Get-Location
diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml
index 74771e36..e5a7d817 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 build delvewheel twine
+ python -m pip install --user build twine
python -m pip list
- name: Build python wheel and install it
run: |
@@ -35,10 +35,12 @@ 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{delvewheel show $_.Name; delvewheel repair $_.Name; python -m pip install --user $_.Name}
+ Get-ChildItem *.whl | ForEach-Object{python -m pip install --user $_.Name}
- name: Test python wheel
run: |
python -m pip install --user pytest