Merge pull request #858 from VincentRouvreau/update_gudhi_deploy

Submodule init and try with ci docker images tagged 3.8.0 (to test)
GUDHI · Apr 7, 2023 · b1d3a4f · b1d3a4f
2 parents 6dbf761 + 73b87f0
commit b1d3a4f
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/pip-build-linux.yml b/.github/workflows/pip-build-linux.yml
@@ -7,7 +7,7 @@ jobs:
     name: build pip wheel
     runs-on: ubuntu-latest
     # cf. https://github.com/GUDHI/gudhi-deploy/blob/main/Dockerfile_for_pip
-    container: gudhi/pip_for_gudhi
+    container: gudhi/pip_for_gudhi:latest
     steps:
       - uses: actions/checkout@v3
         with:

diff --git 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 build twine delocate
+          python -m pip install --user 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
@@ -25,7 +25,6 @@ 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
       - name: Build python wheel and install it
         run: |
           mkdir build

diff --git a/.github/workflows/pip-packaging-linux.yml b/.github/workflows/pip-packaging-linux.yml
@@ -9,7 +9,7 @@ jobs:
     name: build pip wheel
     runs-on: ubuntu-latest
     # cf. https://github.com/GUDHI/gudhi-deploy/blob/main/Dockerfile_for_pip
-    container: gudhi/pip_for_gudhi
+    container: gudhi/pip_for_gudhi:latest
     steps:
       - uses: actions/checkout@v3
         with:

diff --git 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 build twine delocate
+          python -m pip install --user 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
@@ -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 twine
+          python -m pip install --user twine
           python -m pip list
       - name: Build python wheel and install it
         run: |

diff --git a/ext/gudhi-deploy b/ext/gudhi-deploy
+3 −8		Dockerfile_for_circleci_image
+2 −3		Dockerfile_for_circleci_image_without_cgal
+3 −3		Dockerfile_for_doxygen_circleci_image
+4 −13		Dockerfile_for_gudhi_installation
+4 −3		Dockerfile_for_pip
+49 −0		Makefile
+2 −1		build-requirements.txt
+5 −4		test-requirements.txt