From 66c28bfabb3769dd533dd7baf0b09260726f378e Mon Sep 17 00:00:00 2001 From: Vincent Rouvreau Date: Fri, 17 Dec 2021 10:52:49 +0100 Subject: python 3.10 to test build pip. Update vcpkg cgal installation --- .github/workflows/pip-build-linux.yml | 16 ++++++++-------- .github/workflows/pip-build-osx.yml | 2 +- .github/workflows/pip-build-windows.yml | 19 ++++++------------- 3 files changed, 15 insertions(+), 22 deletions(-) (limited to '.github') 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 -- cgit v1.2.3 From b9a7226a7bac01eb10651851363b87b4d60d84c6 Mon Sep 17 00:00:00 2001 From: Vincent Rouvreau Date: Fri, 17 Dec 2021 13:00:32 +0100 Subject: try to fix --- .github/workflows/pip-build-windows.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to '.github') diff --git a/.github/workflows/pip-build-windows.yml b/.github/workflows/pip-build-windows.yml index c6560b4a..2bbc6f49 100644 --- a/.github/workflows/pip-build-windows.yml +++ b/.github/workflows/pip-build-windows.yml @@ -33,16 +33,21 @@ jobs: mkdir build cd build cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=c:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows .. - cd src/python + echo %CD% + 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/ + echo %CD% + dir + cd dist Get-ChildItem *.whl | ForEach-Object{python -m pip install --user $_.Name} - cd ${{ github.workspace }} + cd .. + echo %CD% + dir python -m pip install --user pytest python -m pytest src/python/test/test_alpha_complex.py -- cgit v1.2.3 From 5eb591bee0cae488af7e5b49f94d0f1c02840fd3 Mon Sep 17 00:00:00 2001 From: Vincent Rouvreau Date: Fri, 17 Dec 2021 13:57:45 +0100 Subject: Make it more powershellable --- .github/workflows/pip-build-windows.yml | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to '.github') diff --git a/.github/workflows/pip-build-windows.yml b/.github/workflows/pip-build-windows.yml index 2bbc6f49..f1829e70 100644 --- a/.github/workflows/pip-build-windows.yml +++ b/.github/workflows/pip-build-windows.yml @@ -23,31 +23,29 @@ jobs: set VCPKG_BUILD_TYPE=release vcpkg install eigen3 cgal --triplet x64-windows vcpkg version - ls C:/vcpkg/installed/x64-windows/bin - 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 + ls "C:\vcpkg\installed\x64-windows\bin\" + python -m pip install --user -r .\ext\gudhi-deploy\build-requirements.txt python -m pip list - name: Build python wheel run: | mkdir build - cd build - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=c:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows .. - echo %CD% + cd ".\build\" + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=c:\Tools\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/ + 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: | - echo %CD% + Get-Location dir - cd dist + cd ".\dist\" Get-ChildItem *.whl | ForEach-Object{python -m pip install --user $_.Name} cd .. - echo %CD% + Get-Location dir python -m pip install --user pytest - python -m pytest src/python/test/test_alpha_complex.py + python -m pytest ".\src\python\test\test_alpha_complex.py" -- cgit v1.2.3 From 921a4de71ce435fc46e9f32fcb75e0e6576dbbfc Mon Sep 17 00:00:00 2001 From: Vincent Rouvreau Date: Mon, 3 Jan 2022 16:42:20 +0100 Subject: Fix path --- .github/workflows/pip-build-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/pip-build-windows.yml b/.github/workflows/pip-build-windows.yml index f1829e70..743497f4 100644 --- a/.github/workflows/pip-build-windows.yml +++ b/.github/workflows/pip-build-windows.yml @@ -30,7 +30,7 @@ jobs: run: | mkdir build cd ".\build\" - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=c:\Tools\vcpkg\scripts\buildsystems\vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows .. + 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\" -- cgit v1.2.3 From 4cef95eb986dfaaf70aaae7da630db987639b491 Mon Sep 17 00:00:00 2001 From: Vincent Rouvreau Date: Mon, 3 Jan 2022 22:50:50 +0100 Subject: Install pip package after its build --- .github/workflows/pip-build-windows.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to '.github') diff --git a/.github/workflows/pip-build-windows.yml b/.github/workflows/pip-build-windows.yml index 743497f4..36917d07 100644 --- a/.github/workflows/pip-build-windows.yml +++ b/.github/workflows/pip-build-windows.yml @@ -26,7 +26,7 @@ jobs: ls "C:\vcpkg\installed\x64-windows\bin\" python -m pip install --user -r .\ext\gudhi-deploy\build-requirements.txt python -m pip list - - name: Build python wheel + - name: Build python wheel and install it run: | mkdir build cd ".\build\" @@ -38,13 +38,10 @@ jobs: cp "C:\vcpkg\installed\x64-windows\bin\gmp.dll" ".\gudhi\" python setup.py bdist_wheel ls dist - - name: Install and test python wheel - run: | - Get-Location - dir cd ".\dist\" Get-ChildItem *.whl | ForEach-Object{python -m pip install --user $_.Name} - cd .. + - name: Test python wheel + run: | Get-Location dir python -m pip install --user pytest -- cgit v1.2.3 From 890f598e784ea8b6cd417c2a949326b4e2028fe5 Mon Sep 17 00:00:00 2001 From: Vincent Rouvreau Date: Tue, 4 Jan 2022 13:44:26 +0100 Subject: python 3.10 package and test also gudhi version - can be helpful --- .github/workflows/pip-build-linux.yml | 1 + .github/workflows/pip-build-osx.yml | 1 + .github/workflows/pip-build-windows.yml | 1 + .github/workflows/pip-packaging-linux.yml | 5 ++++ .github/workflows/pip-packaging-osx.yml | 3 ++- .github/workflows/pip-packaging-windows.yml | 42 ++++++++++++----------------- 6 files changed, 27 insertions(+), 26 deletions(-) (limited to '.github') diff --git a/.github/workflows/pip-build-linux.yml b/.github/workflows/pip-build-linux.yml index 44f6dd7c..a2b4f085 100644 --- a/.github/workflows/pip-build-linux.yml +++ b/.github/workflows/pip-build-linux.yml @@ -23,4 +23,5 @@ jobs: - name: Install and test wheel for Python 3.10 run: | $PYTHON310/bin/python -m pip install --user pytest build_310/src/python/dist/*.whl + $PYTHON310/bin/python -c "import gudhi; print(gudhi.__version__)" $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 276e0949..99d515ff 100644 --- a/.github/workflows/pip-build-osx.yml +++ b/.github/workflows/pip-build-osx.yml @@ -35,4 +35,5 @@ jobs: - name: Install and test python wheel run: | python -m pip install --user pytest build/src/python/dist/*.whl + python -c "import gudhi; print(gudhi.__version__)" python -m pytest src/python/test/test_alpha_complex.py diff --git a/.github/workflows/pip-build-windows.yml b/.github/workflows/pip-build-windows.yml index 36917d07..954b59d5 100644 --- a/.github/workflows/pip-build-windows.yml +++ b/.github/workflows/pip-build-windows.yml @@ -45,4 +45,5 @@ jobs: Get-Location dir python -m pip install --user pytest + python -c "import gudhi; print(gudhi.__version__)" python -m pytest ".\src\python\test\test_alpha_complex.py" diff --git a/.github/workflows/pip-packaging-linux.yml b/.github/workflows/pip-packaging-linux.yml index 6ce0ba89..98173ed3 100644 --- a/.github/workflows/pip-packaging-linux.yml +++ b/.github/workflows/pip-packaging-linux.yml @@ -25,6 +25,7 @@ jobs: - name: Install and test wheel for Python 3.6 run: | $PYTHON36/bin/python -m pip install --user pytest build_36/src/python/dist/*.whl + $PYTHON36/bin/python -c "import gudhi; print(gudhi.__version__)" $PYTHON36/bin/python -m pytest src/python/test/test_alpha_complex.py - name: Build wheel for Python 3.7 run: | @@ -37,6 +38,7 @@ jobs: - name: Install and test wheel for Python 3.7 run: | $PYTHON37/bin/python -m pip install --user pytest build_37/src/python/dist/*.whl + $PYTHON37/bin/python -c "import gudhi; print(gudhi.__version__)" $PYTHON37/bin/python -m pytest src/python/test/test_alpha_complex.py - name: Build wheel for Python 3.8 run: | @@ -49,6 +51,7 @@ jobs: - name: Install and test wheel for Python 3.8 run: | $PYTHON38/bin/python -m pip install --user pytest build_38/src/python/dist/*.whl + $PYTHON38/bin/python -c "import gudhi; print(gudhi.__version__)" $PYTHON38/bin/python -m pytest src/python/test/test_alpha_complex.py - name: Build wheel for Python 3.9 run: | @@ -61,6 +64,7 @@ jobs: - name: Install and test wheel for Python 3.9 run: | $PYTHON39/bin/python -m pip install --user pytest build_39/src/python/dist/*.whl + $PYTHON39/bin/python -c "import gudhi; print(gudhi.__version__)" $PYTHON39/bin/python -m pytest src/python/test/test_alpha_complex.py - name: Build wheel for Python 3.10 run: | @@ -73,6 +77,7 @@ jobs: - name: Install and test wheel for Python 3.10 run: | $PYTHON310/bin/python -m pip install --user pytest build_310/src/python/dist/*.whl + $PYTHON310/bin/python -c "import gudhi; print(gudhi.__version__)" $PYTHON310/bin/python -m pytest src/python/test/test_alpha_complex.py - name: Publish on PyPi env: diff --git a/.github/workflows/pip-packaging-osx.yml b/.github/workflows/pip-packaging-osx.yml index 120c15b6..98a77a80 100644 --- a/.github/workflows/pip-packaging-osx.yml +++ b/.github/workflows/pip-packaging-osx.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 @@ -37,6 +37,7 @@ jobs: - name: Install and test python wheel run: | python -m pip install --user pytest build/src/python/dist/*.whl + python -c "import gudhi; print(gudhi.__version__)" python -m pytest src/python/test/test_alpha_complex.py - name: Publish on PyPi env: 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__ -- cgit v1.2.3