From 59e819dd9485bd55b2b3ec6440cb3e3200d96fcb Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 11 Aug 2020 09:43:36 +0200 Subject: Add build pip CI --- .github/workflows/pip-build-windows.yml | 42 +++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 .github/workflows/pip-build-windows.yml (limited to '.github/workflows/pip-build-windows.yml') diff --git a/.github/workflows/pip-build-windows.yml b/.github/workflows/pip-build-windows.yml new file mode 100644 index 00000000..5119ac0c --- /dev/null +++ b/.github/workflows/pip-build-windows.yml @@ -0,0 +1,42 @@ +name: pip build windows + +on: [push, pull_request] + +jobs: + build: + runs-on: windows-latest + strategy: + max-parallel: 4 + matrix: + python-version: ['3.5', '3.6', '3.7', '3.8'] + name: Build wheels for Python ${{ matrix.python-version }} + steps: + - uses: actions/checkout@v1 + with: + submodules: true + - uses: actions/setup-python@v1 + with: + python-version: ${{ matrix.python-version }} + architecture: x64 + - name: Patch + run: | + (new-object System.Net.WebClient).DownloadFile('https://github.com/microsoft/vcpkg/files/4978792/vcpkg_fixup_pkgconfig.cmake.txt','c:\vcpkg\scripts\cmake\vcpkg_fixup_pkgconfig.cmake') + (new-object System.Net.WebClient).DownloadFile('https://github.com/microsoft/vcpkg/files/4978796/vcpkg_acquire_msys.cmake.txt','c:\vcpkg\scripts\cmake\vcpkg_acquire_msys.cmake') + shell: powershell + - name: Install dependencies + run: | + vcpkg update + vcpkg upgrade --no-dry-run + vcpkg install boost-graph boost-serialization boost-date-time boost-system boost-filesystem boost-units boost-thread boost-program-options eigen3 mpfr mpir cgal --triplet x64-windows + python -m pip install --user -r .github/build-requirements.txt + python -m pip install --user twine + python -m pip list + - name: Build python wheel + run: | + mkdir build + cd build + cmake -DCMAKE_BUILD_TYPE=Release -DGMP_INCLUDE_DIR="c:/vcpkg/installed/x64-windows/include" -DGMP_LIBRARIES="c:/vcpkg/installed/x64-windows/lib/mpir.lib" -DGMP_LIBRARIES_DIR="c:/vcpkg/installed/x64-windows/lib" -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows -DPython_ADDITIONAL_VERSIONS=3 .. + cd src/python + cp c:/vcpkg/installed/x64-windows/bin/mpfr.dll gudhi/ + cp c:/vcpkg/installed/x64-windows/bin/mpir.dll gudhi/ + python setup.py bdist_wheel \ No newline at end of file -- cgit v1.2.3 From 3a0a4fc525c84dbb64e41e73e4d138c2b873edbe Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 18 Aug 2020 09:32:35 +0200 Subject: Only python 3.8 should be enough to detect issues --- .github/workflows/pip-build-linux.yml | 24 ------------------------ .github/workflows/pip-build-osx.yml | 2 +- .github/workflows/pip-build-windows.yml | 2 +- 3 files changed, 2 insertions(+), 26 deletions(-) (limited to '.github/workflows/pip-build-windows.yml') diff --git a/.github/workflows/pip-build-linux.yml b/.github/workflows/pip-build-linux.yml index cf41d224..14fdc8d2 100644 --- a/.github/workflows/pip-build-linux.yml +++ b/.github/workflows/pip-build-linux.yml @@ -11,30 +11,6 @@ jobs: - uses: actions/checkout@v1 with: submodules: true - - name: Build wheels for Python 3.5 - run: | - mkdir build_35 - cd build_35 - cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON35/bin/python .. - cd src/python - $PYTHON35/bin/python setup.py bdist_wheel - auditwheel repair dist/*.whl - - name: Build wheels for Python 3.6 - run: | - mkdir build_36 - cd build_36 - cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON36/bin/python .. - cd src/python - $PYTHON36/bin/python setup.py bdist_wheel - auditwheel repair dist/*.whl - - name: Build wheels for Python 3.7 - run: | - mkdir build_37 - cd build_37 - cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON37/bin/python .. - cd src/python - $PYTHON37/bin/python setup.py bdist_wheel - auditwheel repair dist/*.whl - name: Build wheels for Python 3.8 run: | mkdir build_38 diff --git a/.github/workflows/pip-build-osx.yml b/.github/workflows/pip-build-osx.yml index 4af7cd84..15b8880a 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.5', '3.6', '3.7', '3.8'] + python-version: ['3.8'] 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 5119ac0c..11f1ace9 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.5', '3.6', '3.7', '3.8'] + python-version: ['3.8'] name: Build wheels for Python ${{ matrix.python-version }} steps: - uses: actions/checkout@v1 -- cgit v1.2.3 From dbb885175a27399c0b6cd1848801a2c5c9fa91cf Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Mon, 30 Nov 2020 11:30:57 +0100 Subject: Test this fix for pip build --- .github/workflows/pip-build-windows.yml | 9 ++------- .github/workflows/pip-packaging-windows.yml | 8 ++------ 2 files changed, 4 insertions(+), 13 deletions(-) (limited to '.github/workflows/pip-build-windows.yml') diff --git a/.github/workflows/pip-build-windows.yml b/.github/workflows/pip-build-windows.yml index 11f1ace9..995d52dd 100644 --- a/.github/workflows/pip-build-windows.yml +++ b/.github/workflows/pip-build-windows.yml @@ -18,18 +18,13 @@ jobs: with: python-version: ${{ matrix.python-version }} architecture: x64 - - name: Patch - run: | - (new-object System.Net.WebClient).DownloadFile('https://github.com/microsoft/vcpkg/files/4978792/vcpkg_fixup_pkgconfig.cmake.txt','c:\vcpkg\scripts\cmake\vcpkg_fixup_pkgconfig.cmake') - (new-object System.Net.WebClient).DownloadFile('https://github.com/microsoft/vcpkg/files/4978796/vcpkg_acquire_msys.cmake.txt','c:\vcpkg\scripts\cmake\vcpkg_acquire_msys.cmake') - shell: powershell - name: Install dependencies run: | vcpkg update vcpkg upgrade --no-dry-run - vcpkg install boost-graph boost-serialization boost-date-time boost-system boost-filesystem boost-units boost-thread boost-program-options eigen3 mpfr mpir cgal --triplet x64-windows + type c:/vcpkg/ports/cgal/portfile.cmake + vcpkg install eigen3 cgal --triplet x64-windows python -m pip install --user -r .github/build-requirements.txt - python -m pip install --user twine python -m pip list - name: Build python wheel run: | diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 2e45ad71..8f4ab6e7 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -20,16 +20,12 @@ jobs: with: python-version: ${{ matrix.python-version }} architecture: x64 - - name: Patch - run: | - (new-object System.Net.WebClient).DownloadFile('https://github.com/microsoft/vcpkg/files/4978792/vcpkg_fixup_pkgconfig.cmake.txt','c:\vcpkg\scripts\cmake\vcpkg_fixup_pkgconfig.cmake') - (new-object System.Net.WebClient).DownloadFile('https://github.com/microsoft/vcpkg/files/4978796/vcpkg_acquire_msys.cmake.txt','c:\vcpkg\scripts\cmake\vcpkg_acquire_msys.cmake') - shell: powershell - name: Install dependencies run: | vcpkg update vcpkg upgrade --no-dry-run - vcpkg install boost-graph boost-serialization boost-date-time boost-system boost-filesystem boost-units boost-thread boost-program-options eigen3 mpfr mpir cgal --triplet x64-windows + type c:/vcpkg/ports/cgal/portfile.cmake + vcpkg install eigen3 cgal --triplet x64-windows python -m pip install --user -r .github/build-requirements.txt python -m pip install --user twine python -m pip list -- cgit v1.2.3 From ed7dcbebad7dd6fee114723eb34601b292a2e72c Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Thu, 10 Dec 2020 09:52:17 +0100 Subject: Build python 3.9 pip package and use python 3.9 as default test package --- .github/workflows/pip-build-linux.yml | 10 +++++----- .github/workflows/pip-build-osx.yml | 2 +- .github/workflows/pip-build-windows.yml | 2 +- .github/workflows/pip-packaging-linux.yml | 17 +++++++++++++---- .github/workflows/pip-packaging-osx.yml | 2 +- .github/workflows/pip-packaging-windows.yml | 2 +- 6 files changed, 22 insertions(+), 13 deletions(-) (limited to '.github/workflows/pip-build-windows.yml') diff --git a/.github/workflows/pip-build-linux.yml b/.github/workflows/pip-build-linux.yml index 14fdc8d2..cf8ddadf 100644 --- a/.github/workflows/pip-build-linux.yml +++ b/.github/workflows/pip-build-linux.yml @@ -11,11 +11,11 @@ jobs: - uses: actions/checkout@v1 with: submodules: true - - name: Build wheels for Python 3.8 + - name: Build wheels for Python 3.9 run: | - mkdir build_38 - cd build_38 - cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON38/bin/python .. + mkdir build_39 + cd build_39 + cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON39/bin/python .. cd src/python - $PYTHON38/bin/python setup.py bdist_wheel + $PYTHON39/bin/python setup.py bdist_wheel auditwheel repair dist/*.whl \ No newline at end of file diff --git a/.github/workflows/pip-build-osx.yml b/.github/workflows/pip-build-osx.yml index 15b8880a..50b8b09c 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.8'] + python-version: ['3.9'] 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 995d52dd..aacbbc52 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.8'] + python-version: ['3.9'] name: Build wheels for Python ${{ matrix.python-version }} steps: - uses: actions/checkout@v1 diff --git a/.github/workflows/pip-packaging-linux.yml b/.github/workflows/pip-packaging-linux.yml index bd524af9..469c3b3b 100644 --- a/.github/workflows/pip-packaging-linux.yml +++ b/.github/workflows/pip-packaging-linux.yml @@ -45,12 +45,21 @@ jobs: cd src/python $PYTHON38/bin/python setup.py bdist_wheel auditwheel repair dist/*.whl + - name: Build wheels for Python 3.9 + run: | + mkdir build_39 + cd build_39 + cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON39/bin/python .. + cd src/python + $PYTHON39/bin/python setup.py bdist_wheel + auditwheel repair dist/*.whl - name: Publish on PyPi env: TWINE_USERNAME: __token__ TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: | - $PYTHON38/bin/python -m twine upload build_35/src/python/wheelhouse/* - $PYTHON38/bin/python -m twine upload build_36/src/python/wheelhouse/* - $PYTHON38/bin/python -m twine upload build_37/src/python/wheelhouse/* - $PYTHON38/bin/python -m twine upload build_38/src/python/wheelhouse/* \ No newline at end of file + $PYTHON39/bin/python -m twine upload build_35/src/python/wheelhouse/* + $PYTHON39/bin/python -m twine upload build_36/src/python/wheelhouse/* + $PYTHON39/bin/python -m twine upload build_37/src/python/wheelhouse/* + $PYTHON39/bin/python -m twine upload build_38/src/python/wheelhouse/* + $PYTHON39/bin/python -m twine upload build_39/src/python/wheelhouse/* \ No newline at end of file diff --git a/.github/workflows/pip-packaging-osx.yml b/.github/workflows/pip-packaging-osx.yml index c94369ac..46441e65 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'] + python-version: ['3.5', '3.6', '3.7', '3.8', '3.9'] name: Build wheels for Python ${{ matrix.python-version }} steps: - uses: actions/checkout@v1 diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 8f4ab6e7..3a751486 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'] + python-version: ['3.5', '3.6', '3.7', '3.8', '3.9'] name: Build wheels for Python ${{ matrix.python-version }} steps: - uses: actions/checkout@v1 -- cgit v1.2.3