summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Rouvreau <vincent.rouvreau@inria.fr>2023-01-10 17:14:35 +0100
committerVincent Rouvreau <vincent.rouvreau@inria.fr>2023-01-10 17:14:35 +0100
commit2ee42848aba062b891c133eb358d6b105fa5bc67 (patch)
tree1165d6e8aad1527a5fd1c8b644e31bdb1d7edc48
parent0a05c7dfa06c1ddb3ceb3d6ab82bc40e1aeef0ef (diff)
build without virtual environment isolation. Test delvewheel to repair whell on windows
-rw-r--r--.github/workflows/pip-build-linux.yml2
-rw-r--r--.github/workflows/pip-build-osx.yml2
-rw-r--r--.github/workflows/pip-build-windows.yml11
-rw-r--r--.github/workflows/pip-packaging-linux.yml12
-rw-r--r--.github/workflows/pip-packaging-osx.yml2
-rw-r--r--.github/workflows/pip-packaging-windows.yml10
6 files changed, 15 insertions, 24 deletions
diff --git a/.github/workflows/pip-build-linux.yml b/.github/workflows/pip-build-linux.yml
index 980d610f..88ca7db3 100644
--- a/.github/workflows/pip-build-linux.yml
+++ b/.github/workflows/pip-build-linux.yml
@@ -18,7 +18,7 @@ jobs:
cd build_311
cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON311/bin/python ..
cd src/python
- $PYTHON311/bin/python -m build
+ $PYTHON311/bin/python -m build -n
auditwheel show dist/*.whl
auditwheel repair dist/*.whl
ls wheelhouse/*.whl
diff --git a/.github/workflows/pip-build-osx.yml b/.github/workflows/pip-build-osx.yml
index 0b826d5a..81f516cd 100644
--- a/.github/workflows/pip-build-osx.yml
+++ b/.github/workflows/pip-build-osx.yml
@@ -41,7 +41,7 @@ jobs:
cd build
cmake -DCMAKE_BUILD_TYPE=Release -DPython_ADDITIONAL_VERSIONS=3 ..
cd src/python
- python -m build
+ python -m build -n
export PATH="$PATH:`python -m site --user-base`/bin"
delocate-wheel --require-archs universal2 -v dist/*.whl
- name: Install and test python wheel
diff --git a/.github/workflows/pip-build-windows.yml b/.github/workflows/pip-build-windows.yml
index 00820eb0..4455e6af 100644
--- a/.github/workflows/pip-build-windows.yml
+++ b/.github/workflows/pip-build-windows.yml
@@ -25,22 +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 build
- python -m pip list
+ python -m pip install --user build 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 ..
- Get-Location
- dir
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
+ python -m build -n
ls ".\dist\"
cd ".\dist\"
- Get-ChildItem *.whl | ForEach-Object{python -m pip install --user $_.Name}
+ Get-ChildItem *.whl | ForEach-Object{delvewheel show $_.Name; delvewheel repair $_.Name; python -m pip install --user $_.Name}
- name: Test python wheel
run: |
Get-Location
diff --git a/.github/workflows/pip-packaging-linux.yml b/.github/workflows/pip-packaging-linux.yml
index e2cad0e4..866f4335 100644
--- a/.github/workflows/pip-packaging-linux.yml
+++ b/.github/workflows/pip-packaging-linux.yml
@@ -20,7 +20,7 @@ jobs:
cd build_36
cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON36/bin/python ..
cd src/python
- $PYTHON36/bin/python -m build
+ $PYTHON36/bin/python -m build -n
auditwheel repair dist/*.whl
- name: Install and test wheel for Python 3.6
run: |
@@ -33,7 +33,7 @@ jobs:
cd build_37
cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON37/bin/python ..
cd src/python
- $PYTHON37/bin/python -m build
+ $PYTHON37/bin/python -m build -n
auditwheel repair dist/*.whl
- name: Install and test wheel for Python 3.7
run: |
@@ -46,7 +46,7 @@ jobs:
cd build_38
cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON38/bin/python ..
cd src/python
- $PYTHON38/bin/python -m build
+ $PYTHON38/bin/python -m build -n
auditwheel repair dist/*.whl
- name: Install and test wheel for Python 3.8
run: |
@@ -59,7 +59,7 @@ jobs:
cd build_39
cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON39/bin/python ..
cd src/python
- $PYTHON39/bin/python -m build
+ $PYTHON39/bin/python -m build -n
auditwheel repair dist/*.whl
- name: Install and test wheel for Python 3.9
run: |
@@ -72,7 +72,7 @@ jobs:
cd build_310
cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON310/bin/python ..
cd src/python
- $PYTHON310/bin/python -m build
+ $PYTHON310/bin/python -m build -n
auditwheel repair dist/*.whl
- name: Install and test wheel for Python 3.10
run: |
@@ -85,7 +85,7 @@ jobs:
cd build_311
cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON311/bin/python ..
cd src/python
- $PYTHON311/bin/python -m build
+ $PYTHON311/bin/python -m build -n
auditwheel repair dist/*.whl
- name: Install and test wheel for Python 3.11
run: |
diff --git a/.github/workflows/pip-packaging-osx.yml b/.github/workflows/pip-packaging-osx.yml
index 104458e1..15840c9a 100644
--- a/.github/workflows/pip-packaging-osx.yml
+++ b/.github/workflows/pip-packaging-osx.yml
@@ -43,7 +43,7 @@ jobs:
cd build
cmake -DCMAKE_BUILD_TYPE=Release -DPython_ADDITIONAL_VERSIONS=3 ..
cd src/python
- python -m build
+ python -m build -n
- name: Install and test python wheel
run: |
python -m pip install --user pytest build/src/python/dist/*.whl
diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml
index ffbee353..74771e36 100644
--- a/.github/workflows/pip-packaging-windows.yml
+++ b/.github/workflows/pip-packaging-windows.yml
@@ -27,22 +27,18 @@ 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 twine
+ python -m pip install --user build delvewheel 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 ..
- Get-Location
- dir
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
+ python -m build -n
ls ".\dist\"
cd ".\dist\"
- Get-ChildItem *.whl | ForEach-Object{python -m pip install --user $_.Name}
+ Get-ChildItem *.whl | ForEach-Object{delvewheel show $_.Name; delvewheel repair $_.Name; python -m pip install --user $_.Name}
- name: Test python wheel
run: |
python -m pip install --user pytest