From 233de2748377a6ba6fe39712cb9f722dfc352e80 Mon Sep 17 00:00:00 2001 From: Vincent Rouvreau Date: Wed, 14 Dec 2022 08:14:42 +0100 Subject: wheels are in wheelhouse and not in dist. Use 'python -m build' instead of 'python setup.py bdist_wheel' --- .github/workflows/pip-packaging-osx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows/pip-packaging-osx.yml') diff --git a/.github/workflows/pip-packaging-osx.yml b/.github/workflows/pip-packaging-osx.yml index 9ddbcfce..639580b8 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 setup.py bdist_wheel + python -m build - name: Install and test python wheel run: | python -m pip install --user pytest build/src/python/dist/*.whl -- cgit v1.2.3 From 9d22690452fd8ef08055b3412fb14757b1427cd6 Mon Sep 17 00:00:00 2001 From: Vincent Rouvreau Date: Wed, 14 Dec 2022 09:31:22 +0100 Subject: Requires build pip package --- .github/workflows/pip-build-osx.yml | 2 +- .github/workflows/pip-build-windows.yml | 1 + .github/workflows/pip-packaging-osx.yml | 2 +- .github/workflows/pip-packaging-windows.yml | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) (limited to '.github/workflows/pip-packaging-osx.yml') diff --git a/.github/workflows/pip-build-osx.yml b/.github/workflows/pip-build-osx.yml index d1ddf912..0b826d5a 100644 --- a/.github/workflows/pip-build-osx.yml +++ b/.github/workflows/pip-build-osx.yml @@ -28,7 +28,7 @@ jobs: brew update || true brew install boost eigen gmp mpfr cgal || true python -m pip install --user -r ext/gudhi-deploy/build-requirements.txt - python -m pip install --user twine delocate + python -m pip install --user build twine delocate ./scripts/build_osx_universal_gmpfr.sh # Now the universal libraries are in $PWD/deps-uni/lib - name: Build python wheel diff --git a/.github/workflows/pip-build-windows.yml b/.github/workflows/pip-build-windows.yml index c910f781..00820eb0 100644 --- a/.github/workflows/pip-build-windows.yml +++ b/.github/workflows/pip-build-windows.yml @@ -25,6 +25,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 python -m pip list - name: Build python wheel and install it run: | diff --git a/.github/workflows/pip-packaging-osx.yml b/.github/workflows/pip-packaging-osx.yml index 639580b8..104458e1 100644 --- a/.github/workflows/pip-packaging-osx.yml +++ b/.github/workflows/pip-packaging-osx.yml @@ -30,7 +30,7 @@ jobs: brew update || true brew install boost eigen gmp mpfr cgal || true python -m pip install --user -r ext/gudhi-deploy/build-requirements.txt - python -m pip install --user twine delocate + python -m pip install --user build twine delocate ./scripts/build_osx_universal_gmpfr.sh # Now the universal libs are in $PWD/deps-uni/lib - name: Build python wheel diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 29c65138..ffbee353 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 twine + python -m pip install --user build twine python -m pip list - name: Build python wheel and install it run: | -- cgit v1.2.3 From 3105fd101095c33ba7049ad70003bd779b4b1647 Mon Sep 17 00:00:00 2001 From: Vincent Rouvreau Date: Wed, 14 Dec 2022 14:40:56 +0100 Subject: Does not need to install build-rquirements.txt as they are installed from pyproject.toml --- .github/workflows/pip-build-osx.yml | 1 - .github/workflows/pip-build-windows.yml | 1 - .github/workflows/pip-packaging-osx.yml | 1 - .github/workflows/pip-packaging-windows.yml | 1 - 4 files changed, 4 deletions(-) (limited to '.github/workflows/pip-packaging-osx.yml') diff --git a/.github/workflows/pip-build-osx.yml b/.github/workflows/pip-build-osx.yml index 0b826d5a..c4c1f474 100644 --- a/.github/workflows/pip-build-osx.yml +++ b/.github/workflows/pip-build-osx.yml @@ -27,7 +27,6 @@ jobs: run: | brew update || true brew install boost eigen gmp mpfr cgal || true - python -m pip install --user -r ext/gudhi-deploy/build-requirements.txt python -m pip install --user build twine delocate ./scripts/build_osx_universal_gmpfr.sh # Now the universal libraries are in $PWD/deps-uni/lib diff --git a/.github/workflows/pip-build-windows.yml b/.github/workflows/pip-build-windows.yml index 00820eb0..e9b200ea 100644 --- a/.github/workflows/pip-build-windows.yml +++ b/.github/workflows/pip-build-windows.yml @@ -24,7 +24,6 @@ jobs: vcpkg install eigen3 cgal --triplet x64-windows 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 - name: Build python wheel and install it diff --git a/.github/workflows/pip-packaging-osx.yml b/.github/workflows/pip-packaging-osx.yml index 104458e1..502682fa 100644 --- a/.github/workflows/pip-packaging-osx.yml +++ b/.github/workflows/pip-packaging-osx.yml @@ -29,7 +29,6 @@ jobs: run: | brew update || true brew install boost eigen gmp mpfr cgal || true - python -m pip install --user -r ext/gudhi-deploy/build-requirements.txt python -m pip install --user build twine delocate ./scripts/build_osx_universal_gmpfr.sh # Now the universal libs are in $PWD/deps-uni/lib diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index ffbee353..54b439d6 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -26,7 +26,6 @@ jobs: vcpkg install eigen3 cgal --triplet x64-windows 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 list - name: Build python wheel and install it -- cgit v1.2.3 From 0a05c7dfa06c1ddb3ceb3d6ab82bc40e1aeef0ef Mon Sep 17 00:00:00 2001 From: Vincent Rouvreau Date: Thu, 15 Dec 2022 09:07:22 +0100 Subject: Roll back on osx and windows, pip nistall build-requirements are mandatory --- .github/workflows/pip-build-osx.yml | 1 + .github/workflows/pip-build-windows.yml | 1 + .github/workflows/pip-packaging-osx.yml | 1 + .github/workflows/pip-packaging-windows.yml | 1 + 4 files changed, 4 insertions(+) (limited to '.github/workflows/pip-packaging-osx.yml') diff --git a/.github/workflows/pip-build-osx.yml b/.github/workflows/pip-build-osx.yml index c4c1f474..0b826d5a 100644 --- a/.github/workflows/pip-build-osx.yml +++ b/.github/workflows/pip-build-osx.yml @@ -27,6 +27,7 @@ jobs: run: | brew update || true brew install boost eigen gmp mpfr cgal || true + python -m pip install --user -r ext/gudhi-deploy/build-requirements.txt python -m pip install --user build twine delocate ./scripts/build_osx_universal_gmpfr.sh # Now the universal libraries are in $PWD/deps-uni/lib diff --git a/.github/workflows/pip-build-windows.yml b/.github/workflows/pip-build-windows.yml index e9b200ea..00820eb0 100644 --- a/.github/workflows/pip-build-windows.yml +++ b/.github/workflows/pip-build-windows.yml @@ -24,6 +24,7 @@ jobs: vcpkg install eigen3 cgal --triplet x64-windows 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 - name: Build python wheel and install it diff --git a/.github/workflows/pip-packaging-osx.yml b/.github/workflows/pip-packaging-osx.yml index 502682fa..104458e1 100644 --- a/.github/workflows/pip-packaging-osx.yml +++ b/.github/workflows/pip-packaging-osx.yml @@ -29,6 +29,7 @@ jobs: run: | brew update || true brew install boost eigen gmp mpfr cgal || true + python -m pip install --user -r ext/gudhi-deploy/build-requirements.txt python -m pip install --user build twine delocate ./scripts/build_osx_universal_gmpfr.sh # Now the universal libs are in $PWD/deps-uni/lib diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 54b439d6..ffbee353 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -26,6 +26,7 @@ jobs: vcpkg install eigen3 cgal --triplet x64-windows 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 list - name: Build python wheel and install it -- cgit v1.2.3 From 2ee42848aba062b891c133eb358d6b105fa5bc67 Mon Sep 17 00:00:00 2001 From: Vincent Rouvreau Date: Tue, 10 Jan 2023 17:14:35 +0100 Subject: build without virtual environment isolation. Test delvewheel to repair whell on windows --- .github/workflows/pip-build-linux.yml | 2 +- .github/workflows/pip-build-osx.yml | 2 +- .github/workflows/pip-build-windows.yml | 11 +++-------- .github/workflows/pip-packaging-linux.yml | 12 ++++++------ .github/workflows/pip-packaging-osx.yml | 2 +- .github/workflows/pip-packaging-windows.yml | 10 +++------- 6 files changed, 15 insertions(+), 24 deletions(-) (limited to '.github/workflows/pip-packaging-osx.yml') 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 -- cgit v1.2.3