python 3.10 to test build pip. Update vcpkg cgal installation

3 files changed, 15 insertions, 22 deletions

diff --git a/.github/workflows/pip-build-linux.yml b/.github/workflows/pip-build-linux.yml
index 12979a86..44f6dd7c 100644
--- a/.github/workflows/pip-build-linux.yml
+++ b/.github/workflows/pip-build-linux.yml
@@ -12,15 +12,15 @@ jobs:
       - uses: actions/checkout@v1
         with:
           submodules: true
-      - name: Build wheel for Python 3.9
+      - name: Build wheel for Python 3.10
         run: |
-          mkdir build_39
-          cd build_39
-          cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON39/bin/python ..
+          mkdir build_310
+          cd build_310
+          cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON310/bin/python ..
           cd src/python
-          $PYTHON39/bin/python setup.py bdist_wheel
+          $PYTHON310/bin/python setup.py bdist_wheel
           auditwheel repair dist/*.whl
-      - name: Install and test wheel for Python 3.9
+      - name: Install and test wheel for Python 3.10
         run: |
-          $PYTHON39/bin/python -m pip install --user pytest build_39/src/python/dist/*.whl
-          $PYTHON39/bin/python -m pytest src/python/test/test_alpha_complex.py
+          $PYTHON310/bin/python -m pip install --user pytest build_310/src/python/dist/*.whl
+          $PYTHON310/bin/python -m pytest src/python/test/test_alpha_complex.py
diff --git a/.github/workflows/pip-build-osx.yml b/.github/workflows/pip-build-osx.yml
index 1626bb77..276e0949 100644
--- a/.github/workflows/pip-build-osx.yml
+++ b/.github/workflows/pip-build-osx.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ['3.9']
+        python-version: ['3.10']
     name: Build wheels for Python ${{ matrix.python-version }}
     steps:
       - uses: actions/checkout@v1
diff --git a/.github/workflows/pip-build-windows.yml b/.github/workflows/pip-build-windows.yml
index 0080f4d5..c6560b4a 100644
--- a/.github/workflows/pip-build-windows.yml
+++ b/.github/workflows/pip-build-windows.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ['3.9']
+        python-version: ['3.10']
     name: Build wheels for Python ${{ matrix.python-version }}
     steps:
       - uses: actions/checkout@v1
@@ -20,18 +20,11 @@ jobs:
           architecture: x64
       - name: Install dependencies
         run: |
-          cd c:/vcpkg
-          git fetch --all --tags
-          git checkout 2020.11-1
-          bootstrap-vcpkg.bat
           set VCPKG_BUILD_TYPE=release
-          vcpkg install eigen3 mpfr boost-accumulators boost-algorithm boost-bimap boost-callable-traits boost-concept-check boost-container boost-core boost-detail boost-filesystem boost-functional boost-fusion boost-geometry boost-graph boost-heap boost-intrusive boost-iostreams boost-iterator boost-lambda boost-logic boost-math boost-mpl boost-multi-index boost-multiprecision boost-numeric-conversion boost-optional boost-parameter boost-pool boost-preprocessor boost-property-map boost-property-tree boost-ptr-container boost-random boost-range boost-serialization boost-spirit boost-thread boost-tuple boost-type-traits boost-units boost-utility boost-variant --triplet x64-windows
+          vcpkg install eigen3 cgal --triplet x64-windows
           vcpkg version
           ls C:/vcpkg/installed/x64-windows/bin
-          Invoke-WebRequest https://github.com/CGAL/cgal/releases/download/v5.2.1/CGAL-5.2.1.zip -OutFile CGAL-5.2.1.zip
-          Expand-Archive -Path CGAL-5.2.1.zip -DestinationPath .
-          cd CGAL-5.2.1
-          cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=c:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows -DGMP_INCLUDE_DIR=c:/vcpkg/installed/x64-windows/include -DGMP_LIBRARIES=c:/vcpkg/installed/x64-windows/bin/mpir.dll .
+          cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=c:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows .
           cd ${{ github.workspace }}
           python -m pip install --user -r ext/gudhi-deploy/build-requirements.txt
           python -m pip list
@@ -39,10 +32,10 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake -DCGAL_DIR=c:/vcpkg/CGAL-5.2.1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=c:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows -DGMP_INCLUDE_DIR=c:/vcpkg/installed/x64-windows/include -DGMP_LIBRARIES=c:/vcpkg/installed/x64-windows/bin/mpir.dll ..
+          cmake -DCMAKE_BUILD_TYPE=Release -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/mpir.dll gudhi/
+          cp c:/vcpkg/installed/x64-windows/bin/mpfr-6.dll gudhi/
+          cp c:/vcpkg/installed/x64-windows/bin/gmp.dll gudhi/
           python setup.py bdist_wheel
           ls dist
       - name: Install and test python wheel