Merge pull request GUDHI#865 from VincentRouvreau/next_release_3_8_0_rc2

Next release 3.8.0rc2
DerbelHedi · Apr 11, 2023 · 7dc7be7 · 7dc7be7
2 parents 26e37ca + 80a4f95
commit 7dc7be7
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 25 deletions.
diff --git a/.github/for_maintainers/switcher.json b/.github/for_maintainers/switcher.json
@@ -1,8 +1,8 @@
 [
     {
-        "name": "v3.8.0rc1",
-        "version": "3.8.0rc1",
-        "url": "https://gudhi.inria.fr/python/3.8.0rc1/"
+        "name": "v3.8.0rc2",
+        "version": "3.8.0rc2",
+        "url": "https://gudhi.inria.fr/python/3.8.0rc2/"
     },
     {
         "name": "v3.7.1 (latest)",

diff --git 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 -n
+          $PYTHON311/bin/python -m build -n -w
           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
@@ -41,7 +41,7 @@ jobs:
           cd build
           cmake -DCMAKE_BUILD_TYPE=Release -DPython_ADDITIONAL_VERSIONS=3 ..
           cd src/python
-          python -m build -n
+          python -m build -n -w
           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
@@ -33,7 +33,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 -m build -n
+          python -m build -n -w
           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
@@ -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 -n
+          $PYTHON36/bin/python -m build -n -w
           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 -n
+          $PYTHON37/bin/python -m build -n -w
           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 -n
+          $PYTHON38/bin/python -m build -n -w
           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 -n
+          $PYTHON39/bin/python -m build -n -w
           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 -n
+          $PYTHON310/bin/python -m build -n -w
           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 -n
+          $PYTHON311/bin/python -m build -n -w
           auditwheel repair dist/*.whl
       - name: Install and test wheel for Python 3.11
         run: |
@@ -97,9 +97,9 @@ jobs:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
         run: |
-          $PYTHON36/bin/python -m twine upload build_36/src/python/wheelhouse/*
-          $PYTHON36/bin/python -m twine upload build_37/src/python/wheelhouse/*
-          $PYTHON36/bin/python -m twine upload build_38/src/python/wheelhouse/*
-          $PYTHON36/bin/python -m twine upload build_39/src/python/wheelhouse/*
-          $PYTHON36/bin/python -m twine upload build_310/src/python/wheelhouse/*
-          $PYTHON36/bin/python -m twine upload build_311/src/python/wheelhouse/*
+          $PYTHON36/bin/python -m twine upload build_36/src/python/wheelhouse/*.whl
+          $PYTHON36/bin/python -m twine upload build_37/src/python/wheelhouse/*.whl
+          $PYTHON36/bin/python -m twine upload build_38/src/python/wheelhouse/*.whl
+          $PYTHON36/bin/python -m twine upload build_39/src/python/wheelhouse/*.whl
+          $PYTHON36/bin/python -m twine upload build_310/src/python/wheelhouse/*.whl
+          $PYTHON36/bin/python -m twine upload build_311/src/python/wheelhouse/*.whl
diff --git 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 -n
+          python -m build -n -w
       - name: Install and test python wheel
         run: |
           python -m pip install --user pytest build/src/python/dist/*.whl
@@ -56,6 +56,6 @@ jobs:
         run: |
           mkdir wheelhouse
           export PATH="$PATH:`python -m site --user-base`/bin"
-          delocate-listdeps build/src/python/dist/*
-          delocate-wheel --require-archs universal2 -w wheelhouse build/src/python/dist/*
-          python -m twine upload wheelhouse/*
+          delocate-listdeps build/src/python/dist/*.whl
+          delocate-wheel --require-archs universal2 -w wheelhouse build/src/python/dist/*.whl
+          python -m twine upload wheelhouse/*.whl
diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml
@@ -37,7 +37,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 -m build -n
+          python -m build -n -w
           ls ".\dist\"
           cd ".\dist\"
           Get-ChildItem *.whl | ForEach-Object{python -m pip install --user $_.Name}
@@ -50,4 +50,4 @@ jobs:
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-        run: python -m twine upload build/src/python/dist/*
+        run: python -m twine upload build/src/python/dist/*.whl
diff --git a/CMakeGUDHIVersion.txt b/CMakeGUDHIVersion.txt
@@ -2,7 +2,7 @@
 set (GUDHI_MAJOR_VERSION 3)
 set (GUDHI_MINOR_VERSION 8)
 # GUDHI_PATCH_VERSION can be 'ZaN' for Alpha release, 'ZbN' for Beta release, 'ZrcN' for release candidate or 'Z' for a final release.
-set (GUDHI_PATCH_VERSION 0rc1)
+set (GUDHI_PATCH_VERSION 0rc2)
 set(GUDHI_VERSION ${GUDHI_MAJOR_VERSION}.${GUDHI_MINOR_VERSION}.${GUDHI_PATCH_VERSION})
 
 message(STATUS "GUDHI version : ${GUDHI_VERSION}")