python 3.10 package and test also gudhi version - can be helpful

1 files changed, 17 insertions, 25 deletions

diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml
index f387c5ff..6d1571ef 100644
--- a/.github/workflows/pip-packaging-windows.yml
+++ b/.github/workflows/pip-packaging-windows.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ['3.5', '3.6', '3.7', '3.8', '3.9']
+        python-version: ['3.5', '3.6', '3.7', '3.8', '3.9', '3.10']
     name: Build wheels for Python ${{ matrix.python-version }}
     steps:
       - uses: actions/checkout@v1
@@ -22,40 +22,32 @@ 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 .
-          cd ${{ github.workspace }}
-          python -m pip install --user -r ext/gudhi-deploy/build-requirements.txt
+          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 list
-      - name: Build python wheel
+      - name: Build python wheel and install it
         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 ..
-          cd src/python
-          cp c:/vcpkg/installed/x64-windows/bin/mpfr.dll gudhi/
-          cp c:/vcpkg/installed/x64-windows/bin/mpir.dll gudhi/
+          cd ".\build\"
+          cmake -DCMAKE_BUILD_TYPE=Release -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-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
-        run: |
-          cd ${{ github.workspace }}
-          cd build/src/python/dist/
+          cd ".\dist\"
           Get-ChildItem *.whl | ForEach-Object{python -m pip install --user $_.Name}
-          cd ${{ github.workspace }}
+      - name: Test python wheel
+        run: |
           python -m pip install --user pytest
-          python -m pytest src/python/test/test_alpha_complex.py
+          python -c "import gudhi; print(gudhi.__version__)"
+          python -m pytest ".\src\python\test\test_alpha_complex.py"
       - name: Publish on PyPi
         env:
           TWINE_USERNAME: __token__