From e91aa1b8b6f34a67febe38688aa2b25baa4735d1 Mon Sep 17 00:00:00 2001
From: Vincent Rouvreau <vincent.rouvreau@inria.fr>
Date: Tue, 13 Dec 2022 11:22:57 +0100
Subject: Strip dynamic libraries in release mode for smaller pip packages
 under linux

---
 src/python/CMakeLists.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
index 39e2acd4..cda7f8c3 100644
--- a/src/python/CMakeLists.txt
+++ b/src/python/CMakeLists.txt
@@ -251,6 +251,13 @@ if(PYTHONINTERP_FOUND)
         set(GUDHI_PYTHON_EXTRA_LINK_ARGS "${GUDHI_PYTHON_EXTRA_LINK_ARGS}'-mmacosx-version-min=10.14', ")
     endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 
+    # Strip dynamic libraries in release mode for smaller pip packages under linux
+    if(CMAKE_COMPILER_IS_GNUCXX)
+      if(CMAKE_BUILD_TYPE MATCHES Release)
+        set(GUDHI_PYTHON_EXTRA_LINK_ARGS "${GUDHI_PYTHON_EXTRA_LINK_ARGS}'-s', ")
+      endif(CMAKE_BUILD_TYPE MATCHES Release)
+    endif(CMAKE_COMPILER_IS_GNUCXX)
+
     # Loop on INCLUDE_DIRECTORIES PROPERTY
     get_property(GUDHI_INCLUDE_DIRECTORIES DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
     foreach(GUDHI_INCLUDE_DIRECTORY ${GUDHI_INCLUDE_DIRECTORIES})
-- 
cgit v1.2.3


From 2a4b1d97119908303bc02a178767a604203360d3 Mon Sep 17 00:00:00 2001
From: Vincent Rouvreau <vincent.rouvreau@inria.fr>
Date: Tue, 13 Dec 2022 12:04:56 +0100
Subject: Upload build wheel as artifacts

---
 .github/workflows/pip-build-linux.yml   | 5 +++++
 .github/workflows/pip-build-osx.yml     | 5 +++++
 .github/workflows/pip-build-windows.yml | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/.github/workflows/pip-build-linux.yml b/.github/workflows/pip-build-linux.yml
index bc4f999e..11968e97 100644
--- a/.github/workflows/pip-build-linux.yml
+++ b/.github/workflows/pip-build-linux.yml
@@ -25,3 +25,8 @@ jobs:
           $PYTHON311/bin/python -m pip install --user pytest build_311/src/python/dist/*.whl
           $PYTHON311/bin/python -c "import gudhi; print(gudhi.__version__)"
           $PYTHON311/bin/python -m pytest src/python/test/test_alpha_complex.py
+      - name: Upload linux python wheel
+        uses: actions/upload-artifact@v3
+        with:
+          name: linux python wheel
+          path: build_311/src/python/dist/*.whl
diff --git a/.github/workflows/pip-build-osx.yml b/.github/workflows/pip-build-osx.yml
index a438124a..573b9766 100644
--- a/.github/workflows/pip-build-osx.yml
+++ b/.github/workflows/pip-build-osx.yml
@@ -49,3 +49,8 @@ jobs:
           python -m pip install --user pytest build/src/python/dist/*.whl
           python -c "import gudhi; print(gudhi.__version__)"
           python -m pytest src/python/test/test_alpha_complex.py
+      - name: Upload OSx python wheel
+        uses: actions/upload-artifact@v3
+        with:
+          name: osx python wheel
+          path: build/src/python/dist/*.whl
diff --git a/.github/workflows/pip-build-windows.yml b/.github/workflows/pip-build-windows.yml
index 50bdfe2c..9d9026c5 100644
--- a/.github/workflows/pip-build-windows.yml
+++ b/.github/workflows/pip-build-windows.yml
@@ -47,3 +47,8 @@ jobs:
           python -m pip install --user pytest
           python -c "import gudhi; print(gudhi.__version__)"
           python -m pytest ".\src\python\test\test_alpha_complex.py"
+      - name: Upload Windows python wheel
+        uses: actions/upload-artifact@v3
+        with:
+          name: windows python wheel
+          path: build/src/python/dist/*.whl
-- 
cgit v1.2.3


From 822774766946b45350f445e06cf7c66545bf574c Mon Sep 17 00:00:00 2001
From: Vincent Rouvreau <vincent.rouvreau@inria.fr>
Date: Tue, 13 Dec 2022 14:34:58 +0100
Subject: show wheel before repair for debug purposes

---
 .github/workflows/pip-build-linux.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/pip-build-linux.yml b/.github/workflows/pip-build-linux.yml
index 11968e97..550a314f 100644
--- a/.github/workflows/pip-build-linux.yml
+++ b/.github/workflows/pip-build-linux.yml
@@ -19,6 +19,7 @@ jobs:
           cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON311/bin/python ..
           cd src/python
           $PYTHON311/bin/python setup.py bdist_wheel
+          auditwheel show dist/*.whl
           auditwheel repair dist/*.whl
       - name: Install and test wheel for Python 3.11
         run: |
-- 
cgit v1.2.3


From 233de2748377a6ba6fe39712cb9f722dfc352e80 Mon Sep 17 00:00:00 2001
From: Vincent Rouvreau <vincent.rouvreau@inria.fr>
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-build-linux.yml       |  7 ++++---
 .github/workflows/pip-build-osx.yml         |  2 +-
 .github/workflows/pip-build-windows.yml     |  2 +-
 .github/workflows/pip-packaging-linux.yml   | 12 ++++++------
 .github/workflows/pip-packaging-osx.yml     |  2 +-
 .github/workflows/pip-packaging-windows.yml |  2 +-
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/pip-build-linux.yml b/.github/workflows/pip-build-linux.yml
index 550a314f..980d610f 100644
--- a/.github/workflows/pip-build-linux.yml
+++ b/.github/workflows/pip-build-linux.yml
@@ -18,16 +18,17 @@ jobs:
           cd build_311
           cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON311/bin/python ..
           cd src/python
-          $PYTHON311/bin/python setup.py bdist_wheel
+          $PYTHON311/bin/python -m build
           auditwheel show dist/*.whl
           auditwheel repair dist/*.whl
+          ls wheelhouse/*.whl
       - name: Install and test wheel for Python 3.11
         run: |
-          $PYTHON311/bin/python -m pip install --user pytest build_311/src/python/dist/*.whl
+          $PYTHON311/bin/python -m pip install --user pytest build_311/src/python/wheelhouse/*.whl
           $PYTHON311/bin/python -c "import gudhi; print(gudhi.__version__)"
           $PYTHON311/bin/python -m pytest src/python/test/test_alpha_complex.py
       - name: Upload linux python wheel
         uses: actions/upload-artifact@v3
         with:
           name: linux python wheel
-          path: build_311/src/python/dist/*.whl
+          path: build_311/src/python/wheelhouse/*.whl
diff --git a/.github/workflows/pip-build-osx.yml b/.github/workflows/pip-build-osx.yml
index 573b9766..d1ddf912 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 setup.py bdist_wheel
+          python -m build
           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 9d9026c5..c910f781 100644
--- a/.github/workflows/pip-build-windows.yml
+++ b/.github/workflows/pip-build-windows.yml
@@ -36,7 +36,7 @@ jobs:
           cd ".\src\python\"
           cp "C:\vcpkg\installed\x64-windows\bin\mpfr*.dll" ".\gudhi\"
           cp "C:\vcpkg\installed\x64-windows\bin\gmp*.dll" ".\gudhi\"
-          python setup.py bdist_wheel
+          python -m build
           ls ".\dist\"
           cd ".\dist\"
           Get-ChildItem *.whl | ForEach-Object{python -m pip install --user $_.Name}
diff --git a/.github/workflows/pip-packaging-linux.yml b/.github/workflows/pip-packaging-linux.yml
index 14b1cf7a..e2cad0e4 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 setup.py bdist_wheel
+          $PYTHON36/bin/python -m build
           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 setup.py bdist_wheel
+          $PYTHON37/bin/python -m build
           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 setup.py bdist_wheel
+          $PYTHON38/bin/python -m build
           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 setup.py bdist_wheel
+          $PYTHON39/bin/python -m build
           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 setup.py bdist_wheel
+          $PYTHON310/bin/python -m build
           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 setup.py bdist_wheel
+          $PYTHON311/bin/python -m build
           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 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
diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml
index df0db9a5..29c65138 100644
--- a/.github/workflows/pip-packaging-windows.yml
+++ b/.github/workflows/pip-packaging-windows.yml
@@ -39,7 +39,7 @@ jobs:
           cd ".\src\python\"
           cp "C:\vcpkg\installed\x64-windows\bin\mpfr*.dll" ".\gudhi\"
           cp "C:\vcpkg\installed\x64-windows\bin\gmp*.dll" ".\gudhi\"
-          python setup.py bdist_wheel
+          python -m build
           ls ".\dist\"
           cd ".\dist\"
           Get-ChildItem *.whl | ForEach-Object{python -m pip install --user $_.Name}
-- 
cgit v1.2.3


From 9d22690452fd8ef08055b3412fb14757b1427cd6 Mon Sep 17 00:00:00 2001
From: Vincent Rouvreau <vincent.rouvreau@inria.fr>
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(-)

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 <vincent.rouvreau@inria.fr>
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(-)

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 <vincent.rouvreau@inria.fr>
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(+)

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 <vincent.rouvreau@inria.fr>
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(-)

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


From 14a0e7bc0a89ab5d576c39ffd596843608fbf1dc Mon Sep 17 00:00:00 2001
From: Vincent Rouvreau <vincent.rouvreau@inria.fr>
Date: Tue, 10 Jan 2023 19:29:04 +0100
Subject: Remove delvewheel

---
 .github/workflows/pip-build-windows.yml     | 6 ++++--
 .github/workflows/pip-packaging-windows.yml | 6 ++++--
 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
-- 
cgit v1.2.3