Merge branch 'master' of https://github.com/GUDHI/gudhi-devel into Ex…

…act_SW
GUDHI · Dec 5, 2024 · 3bd1229 · 3bd1229
2 parents 2360f6e + cd6dd97
commit 3bd1229
Showing 1 changed file with 53 additions and 25 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,7 +5,7 @@ jobs:
   examples:
     docker:
       # cf. https://github.com/GUDHI/gudhi-deploy/blob/main/Dockerfile_for_circleci_image
-      - image: gudhi/ci_for_gudhi:2024.10.01
+      - image: gudhi/ci_for_gudhi:2024.12.01
     steps:
       - checkout
       - run:
@@ -24,7 +24,7 @@ jobs:
 
   tests:
     docker:
-      - image: gudhi/ci_for_gudhi:2024.10.01
+      - image: gudhi/ci_for_gudhi:2024.12.01
     steps:
       - checkout
       - run:
@@ -43,7 +43,7 @@ jobs:
 
   debug_tests:
     docker:
-      - image: gudhi/ci_for_gudhi:2024.10.01
+      - image: gudhi/ci_for_gudhi:2024.12.01
     steps:
       - checkout
       - run:
@@ -62,7 +62,7 @@ jobs:
 
   utils:
     docker:
-      - image: gudhi/ci_for_gudhi:2024.10.01
+      - image: gudhi/ci_for_gudhi:2024.12.01
     steps:
       - checkout
       - run:
@@ -81,7 +81,7 @@ jobs:
 
   python:
     docker:
-      - image: gudhi/ci_for_gudhi:2024.10.01
+      - image: gudhi/ci_for_gudhi:2024.12.01
     resource_class: large # Delaunay complex requires about 5 Gb of RAM to compile
     steps:
       - checkout
@@ -100,13 +100,13 @@ jobs:
             cd version
             cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON -DWITH_GUDHI_REMOTE_TEST=ON .
             cd python
-            python3 setup.py build_ext --inplace
+            python setup.py build_ext --inplace
             ctest --output-on-failure
             make sphinx
             cp -R sphinx /tmp/sphinx
-            python3 setup.py install
-            python3 setup.py clean --all
-            python3 -B -m pytest test/*.py --cov-report html --cov=gudhi
+            python setup.py install
+            python setup.py clean --all
+            python -B -m pytest test/*.py --cov-report html --cov=gudhi
             cp -R htmlcov /tmp/htmlcov
       - store_artifacts:
           path: /tmp/sphinx
@@ -117,7 +117,7 @@ jobs:
 
   doxygen:
     docker:
-      - image: gudhi/doxygen_for_gudhi:2024.10.01
+      - image: gudhi/doxygen_for_gudhi:2024.12.01
     steps:
       - checkout
       - run:
@@ -147,7 +147,7 @@ jobs:
 
   bibliography:
     docker:
-      - image: gudhi/doxygen_for_gudhi:2024.10.01
+      - image: gudhi/doxygen_for_gudhi:2024.12.01
     steps:
       - checkout
       - run:
@@ -170,7 +170,7 @@ jobs:
   examples_without_cgal_eigen:
     docker:
       # cf. https://github.com/GUDHI/gudhi-deploy/blob/main/Dockerfile_for_circleci_image_without_cgal
-      - image: gudhi/ci_for_gudhi_wo_cgal:2024.10.01
+      - image: gudhi/ci_for_gudhi_wo_cgal:2024.12.01
     steps:
       - checkout
       - run:
@@ -189,7 +189,7 @@ jobs:
 
   tests_without_cgal_eigen:
     docker:
-      - image: gudhi/ci_for_gudhi_wo_cgal:2024.10.01
+      - image: gudhi/ci_for_gudhi_wo_cgal:2024.12.01
     steps:
       - checkout
       - run:
@@ -208,7 +208,7 @@ jobs:
 
   utils_without_cgal_eigen:
     docker:
-      - image: gudhi/ci_for_gudhi_wo_cgal:2024.10.01
+      - image: gudhi/ci_for_gudhi_wo_cgal:2024.12.01
     steps:
       - checkout
       - run:
@@ -227,7 +227,7 @@ jobs:
 
   python_without_cgal_eigen:
     docker:
-      - image: gudhi/ci_for_gudhi_wo_cgal:2024.10.01
+      - image: gudhi/ci_for_gudhi_wo_cgal:2024.12.01
     steps:
       - checkout
       - run:
@@ -242,14 +242,14 @@ jobs:
             cd build
             cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON ..
             cd src/python
-            python3 setup.py build_ext --inplace
+            python setup.py build_ext --inplace
             ctest --output-on-failure
 
   ### With all third parties, except CGAL
 
   examples_without_cgal:
     docker:
-      - image: gudhi/ci_for_gudhi_wo_cgal:2024.10.01
+      - image: gudhi/ci_for_gudhi_wo_cgal:2024.12.01
     steps:
       - checkout
       - run:
@@ -260,15 +260,22 @@ jobs:
       - run:
           name: Build and test examples without cgal
           command: |
+            cur_dir=`pwd`
+            cd /eigen-3.4.0
             mkdir build
             cd build
-            cmake -DCMAKE_BUILD_TYPE=Release -DEIGEN3_INCLUDE_DIR=/eigen-3.3.9 -DWITH_GUDHI_EXAMPLE=ON -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF ..
+            cmake ..
+            make install
+            cd $cur_dir
+            mkdir build
+            cd build
+            cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=ON -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF ..
             make all
             ctest --output-on-failure
 
   tests_without_cgal:
     docker:
-      - image: gudhi/ci_for_gudhi_wo_cgal:2024.10.01
+      - image: gudhi/ci_for_gudhi_wo_cgal:2024.12.01
     steps:
       - checkout
       - run:
@@ -279,15 +286,22 @@ jobs:
       - run:
           name: Build and test unitary tests without cgal
           command: |
+            cur_dir=`pwd`
+            cd /eigen-3.4.0
             mkdir build
             cd build
-            cmake -DCMAKE_BUILD_TYPE=Release -DEIGEN3_INCLUDE_DIR=/eigen-3.3.9 -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=ON -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF ..
+            cmake ..
+            make install
+            cd $cur_dir
+            mkdir build
+            cd build
+            cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=ON -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF ..
             make all
             ctest --output-on-failure
 
   utils_without_cgal:
     docker:
-      - image: gudhi/ci_for_gudhi_wo_cgal:2024.10.01
+      - image: gudhi/ci_for_gudhi_wo_cgal:2024.12.01
     steps:
       - checkout
       - run:
@@ -298,15 +312,22 @@ jobs:
       - run:
           name: Build and test utilities without cgal
           command: |
+            cur_dir=`pwd`
+            cd /eigen-3.4.0
             mkdir build
             cd build
-            cmake -DCMAKE_BUILD_TYPE=Release -DEIGEN3_INCLUDE_DIR=/eigen-3.3.9 -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=ON -DWITH_GUDHI_PYTHON=OFF ..
+            cmake ..
+            make install
+            cd $cur_dir
+            mkdir build
+            cd build
+            cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=ON -DWITH_GUDHI_PYTHON=OFF ..
             make all
             ctest --output-on-failure
 
   python_without_cgal:
     docker:
-      - image: gudhi/ci_for_gudhi_wo_cgal:2024.10.01
+      - image: gudhi/ci_for_gudhi_wo_cgal:2024.12.01
     steps:
       - checkout
       - run:
@@ -317,11 +338,18 @@ jobs:
       - run:
           name: Build and test python module without cgal
           command: |
+            cur_dir=`pwd`
+            cd /eigen-3.4.0
             mkdir build
             cd build
-            cmake -DCMAKE_BUILD_TYPE=Release -DEIGEN3_INCLUDE_DIR=/eigen-3.3.9 -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON ..
+            cmake ..
+            make install
+            cd $cur_dir
+            mkdir build
+            cd build
+            cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON ..
             cd src/python
-            python3 setup.py build_ext --inplace
+            python setup.py build_ext --inplace
             ctest --output-on-failure
 
 workflows: