From 5fc667a7cbc61649801074f884752bbc33e47b0d Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 05:47:38 +0200 Subject: Add Atol to next release --- .github/next_release.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to '.github') diff --git a/.github/next_release.md b/.github/next_release.md index e73f7c96..14546066 100644 --- a/.github/next_release.md +++ b/.github/next_release.md @@ -30,8 +30,13 @@ Below is a list of changes made since GUDHI 3.2.0: - [Bottleneck distance](https://gudhi.inria.fr/python/latest/bottleneck_distance_user.html) - Python interface to [hera](https://github.com/grey-narn/hera)'s bottleneck distance -- Representations - Python interface change - - [Wasserstein metrics](https://gudhi.inria.fr/python/latest/representations.html#gudhi.representations.metrics.WassersteinDistance) +- Persistence representations + - [Atol](https://gudhi.inria.fr/python/latest/representations.html#gudhi.representations.vector_methods.Atol) + is integrated in finite vectorisation methods. This + [article](https://www.fujitsu.com/global/about/resources/news/press-releases/2020/0316-01.html) talks about + applications using Atol. This module was originally available at + [https://github.com/martinroyer/atol](https://github.com/martinroyer/atol) + - Python interface change: [Wasserstein metrics](https://gudhi.inria.fr/python/latest/representations.html#gudhi.representations.metrics.WassersteinDistance) is now [hera](https://github.com/grey-narn/hera) by default - Miscellaneous -- cgit v1.2.3 From 250eb63a0424773344e6ada290dc42a4f5cee67b Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 10:46:19 +0200 Subject: Do not pay attention to brew installation result --- .github/workflows/pip-packaging-osx.yml | 3 ++- azure-pipelines.yml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-osx.yml b/.github/workflows/pip-packaging-osx.yml index 85c3c807..c94369ac 100644 --- a/.github/workflows/pip-packaging-osx.yml +++ b/.github/workflows/pip-packaging-osx.yml @@ -22,7 +22,8 @@ jobs: architecture: x64 - name: Install dependencies run: | - brew update && brew install boost eigen gmp mpfr cgal + brew update || true + brew install boost eigen gmp mpfr cgal || true python -m pip install --user -r .github/build-requirements.txt python -m pip install --user twine delocate - name: Build python wheel diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 48291fbc..8e88cab5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -9,7 +9,6 @@ jobs: variables: pythonVersion: '3.6' cmakeBuildType: Release - customInstallation: 'brew update && brew install graphviz doxygen boost eigen gmp mpfr tbb cgal' steps: - bash: echo "##vso[task.prependpath]$CONDA/bin" @@ -23,7 +22,8 @@ jobs: sudo conda install --yes --quiet --name gudhi_build_env python=$(pythonVersion) python -m pip install --user -r .github/build-requirements.txt python -m pip install --user -r .github/test-requirements.txt - $(customInstallation) + brew update || true + brew install graphviz doxygen boost eigen gmp mpfr tbb cgal || true displayName: 'Install build dependencies' - bash: | source activate gudhi_build_env -- cgit v1.2.3 From 3f566028c076c271865b00d060bd311690a207fe Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 14:12:29 +0200 Subject: debug pip packaging --- .github/workflows/pip-packaging-windows.yml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 1cadf6b1..32abd0d2 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -1,8 +1,13 @@ name: pip packaging windows +#on: +# release: +# types: [published] + on: - release: - types: [published] + push: + branches: + - '*' jobs: build: @@ -22,7 +27,7 @@ jobs: architecture: x64 - name: Install dependencies run: | - vcpkg install boost-graph:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows mpfr:x64-windows mpir:x64-windows cgal:x64-windows + 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 - name: Build python wheel @@ -35,8 +40,8 @@ jobs: 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 - - name: Publish on PyPi - env: - TWINE_USERNAME: __token__ - TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} - run: python -m twine upload build/src/python/dist/* +# - name: Publish on PyPi +# env: +# TWINE_USERNAME: __token__ +# TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} +# run: python -m twine upload build/src/python/dist/* -- cgit v1.2.3 From 361c2279c176b16aa0d8c8268235c256e26ee88a Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 14:14:27 +0200 Subject: debug pip packaging --- .github/workflows/pip-packaging-windows.yml | 2 ++ 1 file changed, 2 insertions(+) (limited to '.github') diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 32abd0d2..438108e8 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -8,6 +8,8 @@ on: push: branches: - '*' + - '*/*' + - '**' jobs: build: -- cgit v1.2.3 From 55aa64c8a0ebd3eeb3a2a53048151ff02d0e1a45 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 14:21:10 +0200 Subject: on push or PR --- .github/workflows/pip-packaging-windows.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 438108e8..cf6aa809 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -4,12 +4,11 @@ name: pip packaging windows # release: # types: [published] -on: - push: - branches: - - '*' - - '*/*' - - '**' +on: [push, pull_request] + branches: + - '*' + - '*/*' + - '**' jobs: build: -- cgit v1.2.3 From 769d16af0822a4afd0f5cf3e17ea93e254ee5129 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 14:32:31 +0200 Subject: on push or PR --- .github/workflows/pip-packaging-windows.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index cf6aa809..ab913b7c 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -4,11 +4,18 @@ name: pip packaging windows # release: # types: [published] -on: [push, pull_request] - branches: - - '*' - - '*/*' - - '**' +on: + push: + branches: + - '*' + - '*/*' + - '**' +on: + pull_request: + branches: + - '*' + - '*/*' + - '**' jobs: build: -- cgit v1.2.3 From b47caf9b21755f4327495a22c4ad2cd473dfc2a6 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 14:34:46 +0200 Subject: list boost packages --- .github/workflows/pip-packaging-windows.yml | 1 + 1 file changed, 1 insertion(+) (limited to '.github') diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index ab913b7c..1e890ab6 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -41,6 +41,7 @@ jobs: - name: Build python wheel run: | python --version + vcpkg search boost 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 -DPython_ADDITIONAL_VERSIONS=3 .. -- cgit v1.2.3 From 1af9341fc366e95dd8c2d6af4e1f9121dcf30066 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 14:36:37 +0200 Subject: not valid yml --- .github/workflows/pip-packaging-windows.yml | 6 ------ 1 file changed, 6 deletions(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 1e890ab6..9125b85c 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -10,12 +10,6 @@ on: - '*' - '*/*' - '**' -on: - pull_request: - branches: - - '*' - - '*/*' - - '**' jobs: build: -- cgit v1.2.3 From 160e4ca1da07ed4654e30ada31161d65689ec8a6 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 14:47:24 +0200 Subject: set some cmake variables --- .github/workflows/pip-packaging-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 9125b85c..29622945 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -38,7 +38,7 @@ jobs: vcpkg search boost 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 -DPython_ADDITIONAL_VERSIONS=3 .. + 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/ -- cgit v1.2.3 From 4eac68dbdf2c5d2c1a0accd4bdc0d78b502e58e9 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 14:59:19 +0200 Subject: boost-test for boost-unit-test-framework --- .github/workflows/pip-packaging-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 29622945..fb98c045 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -29,7 +29,7 @@ jobs: architecture: x64 - name: Install dependencies 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 + vcpkg install boost-graph boost-serialization boost-date-time boost-system boost-filesystem boost-test 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 - name: Build python wheel -- cgit v1.2.3 From fa8dd069b58d79c39b5be78cfcf411af118a3a59 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 15:12:08 +0200 Subject: vcpkg list not search --- .github/workflows/pip-packaging-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index fb98c045..1f40a476 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -35,7 +35,7 @@ jobs: - name: Build python wheel run: | python --version - vcpkg search boost + vcpkg list 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 .. -- cgit v1.2.3 From 592b268e4afee402afdead534217668f40cd23bb Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 15:26:42 +0200 Subject: lost some packages --- .github/workflows/pip-packaging-windows.yml | 3 +++ 1 file changed, 3 insertions(+) (limited to '.github') diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 1f40a476..9bc0b28f 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -30,12 +30,15 @@ jobs: - name: Install dependencies run: | vcpkg install boost-graph boost-serialization boost-date-time boost-system boost-filesystem boost-test boost-thread boost-program-options eigen3 mpfr mpir cgal --triplet x64-windows + vcpkg list 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: | python --version vcpkg list + python -m pip list 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 .. -- cgit v1.2.3 From 25c4f713ce91e100d7abfe4bbba9f5159e39e6e1 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 15:42:19 +0200 Subject: try to cache vcpkg install --- .github/workflows/pip-packaging-windows.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 9bc0b28f..268e7ac4 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -23,21 +23,29 @@ jobs: - uses: actions/checkout@v1 with: submodules: true + # Restore from cache the previously built ports. If cache-miss, download, build vcpkg. + - name: Restore from cache and install vcpkg + # Download and build vcpkg, without installing any port. If content is cached already, it is a no-op. + uses: lukka/run-vcpkg@v3 + with: + setupOnly: true + # Now that vcpkg is installed, it is being used to run desired arguments. + - run: | + $VCPKG_ROOT/vcpkg @$vcpkgResponseFile + $VCPKG_ROOT/vcpkg install boost-graph boost-serialization boost-date-time boost-system boost-filesystem boost-test boost-thread boost-program-options eigen3 mpfr mpir cgal --triplet x64-windows + shell: bash - uses: actions/setup-python@v1 with: python-version: ${{ matrix.python-version }} architecture: x64 - name: Install dependencies run: | - vcpkg install boost-graph boost-serialization boost-date-time boost-system boost-filesystem boost-test boost-thread boost-program-options eigen3 mpfr mpir cgal --triplet x64-windows - vcpkg list 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: | python --version - vcpkg list python -m pip list mkdir build cd build -- cgit v1.2.3 From 800cd2a653c1ce7a7b8b40b3d856147641922013 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 15:54:58 +0200 Subject: All in one --- .github/workflows/pip-packaging-windows.yml | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 268e7ac4..dabfceed 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -23,30 +23,17 @@ jobs: - uses: actions/checkout@v1 with: submodules: true - # Restore from cache the previously built ports. If cache-miss, download, build vcpkg. - - name: Restore from cache and install vcpkg - # Download and build vcpkg, without installing any port. If content is cached already, it is a no-op. - uses: lukka/run-vcpkg@v3 - with: - setupOnly: true - # Now that vcpkg is installed, it is being used to run desired arguments. - - run: | - $VCPKG_ROOT/vcpkg @$vcpkgResponseFile - $VCPKG_ROOT/vcpkg install boost-graph boost-serialization boost-date-time boost-system boost-filesystem boost-test boost-thread boost-program-options eigen3 mpfr mpir cgal --triplet x64-windows - shell: bash - uses: actions/setup-python@v1 with: python-version: ${{ matrix.python-version }} architecture: x64 - name: Install dependencies run: | + vcpkg install boost-graph boost-serialization boost-date-time boost-system boost-filesystem boost-test boost-thread boost-program-options eigen3 mpfr mpir cgal --triplet x64-windows + vcpkg list 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: | - python --version - python -m pip list 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 .. -- cgit v1.2.3 From 17dd2957420cdf0c0fb4ffcaf046cac1dd8ab41c Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 16:17:34 +0200 Subject: No boost tests --- .github/workflows/pip-packaging-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index dabfceed..eec7b1a9 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -29,7 +29,7 @@ jobs: architecture: x64 - name: Install dependencies run: | - vcpkg install boost-graph boost-serialization boost-date-time boost-system boost-filesystem boost-test boost-thread boost-program-options eigen3 mpfr mpir cgal --triplet x64-windows + 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 vcpkg list python -m pip install --user -r .github/build-requirements.txt python -m pip install --user twine -- cgit v1.2.3 From 6d07bf0baea26cf9c289ac078f70ec22f6c68ce7 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Wed, 5 Aug 2020 07:18:35 +0200 Subject: vcpkg update as bzip2 fails --- .github/workflows/pip-packaging-windows.yml | 1 + 1 file changed, 1 insertion(+) (limited to '.github') diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index eec7b1a9..0ed6edb2 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -29,6 +29,7 @@ jobs: architecture: x64 - name: Install dependencies run: | + vcpkg update 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 vcpkg list python -m pip install --user -r .github/build-requirements.txt -- cgit v1.2.3 From 148b128fe955b57b606ffd0ee87c201d8371d143 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Wed, 5 Aug 2020 07:32:08 +0200 Subject: vcpkg upgrade --- .github/workflows/pip-packaging-windows.yml | 1 + 1 file changed, 1 insertion(+) (limited to '.github') diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 0ed6edb2..14bf2ab7 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -30,6 +30,7 @@ jobs: - 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 vcpkg list python -m pip install --user -r .github/build-requirements.txt -- cgit v1.2.3 From 39a79031a1c98100d92afd584b4a0a783846355e Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Wed, 5 Aug 2020 09:26:04 +0200 Subject: Try a patch fix --- .github/workflows/pip-packaging-windows.yml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to '.github') diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 14bf2ab7..0217f4fd 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -27,8 +27,14 @@ 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: | + deltree "c:\vcpkg\downloads\tools\msys2" 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 -- cgit v1.2.3 From f1c0e4624994113be3fd2b5d1c80b45d8a62087a Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Mon, 10 Aug 2020 07:34:00 +0200 Subject: Try w/o deltree --- .github/workflows/pip-packaging-windows.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 0217f4fd..ae35ee30 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -32,13 +32,12 @@ jobs: (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 +# deltree "c:\vcpkg\downloads\tools\msys2" + - name: Install dependencies run: | - deltree "c:\vcpkg\downloads\tools\msys2" 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 - vcpkg list 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 d8121fe25816a25f4aacbd3d6a048c7d1e38e28c Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Mon, 10 Aug 2020 07:42:39 +0200 Subject: syntax error --- .github/workflows/pip-packaging-windows.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index ae35ee30..bba94712 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -32,8 +32,7 @@ jobs: (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 -# deltree "c:\vcpkg\downloads\tools\msys2" - - name: Install dependencies + - name: Install dependencies run: | vcpkg update vcpkg upgrade --no-dry-run -- cgit v1.2.3 From 2475e9ec590ae36d8b5f76216f6575c371b76165 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Mon, 10 Aug 2020 08:21:00 +0200 Subject: Is it still ok ? --- .github/workflows/pip-packaging-windows.yml | 2 ++ 1 file changed, 2 insertions(+) (limited to '.github') diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index bba94712..2d1058fe 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -40,6 +40,8 @@ jobs: python -m pip install --user -r .github/build-requirements.txt python -m pip install --user twine python -m pip list + - name: Build wheels + 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 .. -- cgit v1.2.3 From a73448292bf41a6af928f649905e2ceeca199c24 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Mon, 10 Aug 2020 08:53:42 +0200 Subject: Some cleanups before the merge --- .github/workflows/pip-packaging-windows.yml | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 2d1058fe..2e45ad71 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -1,15 +1,8 @@ name: pip packaging windows -#on: -# release: -# types: [published] - -on: - push: - branches: - - '*' - - '*/*' - - '**' +on: + release: + types: [published] jobs: build: @@ -40,7 +33,7 @@ jobs: python -m pip install --user -r .github/build-requirements.txt python -m pip install --user twine python -m pip list - - name: Build wheels + - name: Build python wheel run: | mkdir build cd build @@ -49,8 +42,8 @@ jobs: 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 -# - name: Publish on PyPi -# env: -# TWINE_USERNAME: __token__ -# TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} -# run: python -m twine upload build/src/python/dist/* + - name: Publish on PyPi + env: + TWINE_USERNAME: __token__ + TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} + run: python -m twine upload build/src/python/dist/* -- cgit v1.2.3 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-linux.yml | 45 +++++++++++++++++++++++++++++++++ .github/workflows/pip-build-osx.yml | 34 +++++++++++++++++++++++++ .github/workflows/pip-build-windows.yml | 42 ++++++++++++++++++++++++++++++ 3 files changed, 121 insertions(+) create mode 100644 .github/workflows/pip-build-linux.yml create mode 100644 .github/workflows/pip-build-osx.yml create mode 100644 .github/workflows/pip-build-windows.yml (limited to '.github') diff --git a/.github/workflows/pip-build-linux.yml b/.github/workflows/pip-build-linux.yml new file mode 100644 index 00000000..cf41d224 --- /dev/null +++ b/.github/workflows/pip-build-linux.yml @@ -0,0 +1,45 @@ +name: pip build linux + +on: [push, pull_request] + +jobs: + build: + name: build pip wheels + runs-on: ubuntu-latest + container: gudhi/pip_for_gudhi + steps: + - 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 + cd build_38 + cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON38/bin/python .. + cd src/python + $PYTHON38/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 new file mode 100644 index 00000000..4af7cd84 --- /dev/null +++ b/.github/workflows/pip-build-osx.yml @@ -0,0 +1,34 @@ +name: pip build osx + +on: [push, pull_request] + +jobs: + build: + runs-on: macos-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: Install dependencies + run: | + brew update || true + brew install boost eigen gmp mpfr cgal || true + python -m pip install --user -r .github/build-requirements.txt + python -m pip install --user twine delocate + - name: Build python wheel + run: | + python --version + mkdir build + cd build + cmake -DCMAKE_BUILD_TYPE=Release -DPython_ADDITIONAL_VERSIONS=3 .. + cd src/python + python setup.py bdist_wheel 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 88d5c8e795b1b32fd44349500aad0da7aa9cea59 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 11 Aug 2020 10:48:16 +0200 Subject: gudhi 3.3.0 + new gudhi version improvement --- .github/for_maintainers/new_gudhi_version_creation.md | 8 ++++---- CMakeGUDHIVersion.txt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to '.github') diff --git a/.github/for_maintainers/new_gudhi_version_creation.md b/.github/for_maintainers/new_gudhi_version_creation.md index 86c393a0..0dcb25fe 100644 --- a/.github/for_maintainers/new_gudhi_version_creation.md +++ b/.github/for_maintainers/new_gudhi_version_creation.md @@ -18,7 +18,7 @@ Checkin the modifications, build and test the version: ```bash git submodule update --init rm -rf build; mkdir build; cd build -cmake -DCGAL_DIR=/your/path/to/CGAL -DWITH_GUDHI_EXAMPLE=ON -DWITH_GUDHI_BENCHMARK=ON -DUSER_VERSION_DIR=gudhi.@GUDHI_VERSION@ -DPython_ADDITIONAL_VERSIONS=3 .. +cmake -DCMAKE_BUILD_TYPE=Release -DCGAL_DIR=/your/path/to/CGAL -DWITH_GUDHI_EXAMPLE=ON -DWITH_GUDHI_BENCHMARK=ON -DUSER_VERSION_DIR=gudhi.@GUDHI_VERSION@ -DPython_ADDITIONAL_VERSIONS=3 .. make user_version date +"%d-%m-%Y-%T" > gudhi.@GUDHI_VERSION@/timestamp.txt tar -czvf gudhi.@GUDHI_VERSION@.tar.gz gudhi.@GUDHI_VERSION@ @@ -43,8 +43,8 @@ make doxygen 2>&1 | tee dox.log && grep warning dox.log cp -R gudhi.@GUDHI_VERSION@/doc/html gudhi.doc.@GUDHI_VERSION@/cpp cd gudhi.@GUDHI_VERSION@ rm -rf build; mkdir build; cd build -cmake -DCGAL_DIR=/your/path/to/CGAL -DWITH_GUDHI_EXAMPLE=ON -DPython_ADDITIONAL_VERSIONS=3 .. -export LC_ALL=en_US.UTF-8 # cf. bug +cmake -DCMAKE_BUILD_TYPE=Release -DCGAL_DIR=/your/path/to/CGAL -DWITH_GUDHI_EXAMPLE=ON -DPython_ADDITIONAL_VERSIONS=3 .. +export LC_ALL=en_US.UTF-8 # cf. bug https://github.com/GUDHI/gudhi-devel/issues/111 make sphinx ``` @@ -82,7 +82,7 @@ ln -s @GUDHI_VERSION@ latest * Go on page https://github.com/GUDHI/gudhi-devel/releases/new * Name the tag: tags/gudhi-release-@GUDHI_VERSION@ -* Name the release GUDHI @GUDHI_VERSION@ +* Name the release GUDHI @GUDHI_VERSION@ release * Write the release note * Drag'n drop *gudhi.@GUDHI_VERSION@.tar.gz*, *md5sum.txt*, *sha256sum.txt*, *sha512sum.txt* files * Tick the *This is a pre-release* check button if this is a release candidate (untick if this is an official version) diff --git a/CMakeGUDHIVersion.txt b/CMakeGUDHIVersion.txt index 4ed57729..a08b7b4d 100644 --- a/CMakeGUDHIVersion.txt +++ b/CMakeGUDHIVersion.txt @@ -2,7 +2,7 @@ set (GUDHI_MAJOR_VERSION 3) set (GUDHI_MINOR_VERSION 3) # GUDHI_PATCH_VERSION can be 'ZaN' for Alpha release, 'ZbN' for Beta release, 'ZrcN' for release candidate or 'Z' for a final release. -set (GUDHI_PATCH_VERSION 0rc2) +set (GUDHI_PATCH_VERSION 0) set(GUDHI_VERSION ${GUDHI_MAJOR_VERSION}.${GUDHI_MINOR_VERSION}.${GUDHI_PATCH_VERSION}) message(STATUS "GUDHI version : ${GUDHI_VERSION}") -- cgit v1.2.3 From a08971af8be1405c91429cf52e4c3301ffd50945 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 11 Aug 2020 17:13:22 +0200 Subject: Next release + version creation improvement --- .../for_maintainers/new_gudhi_version_creation.md | 41 ++++++++++++++++++- .github/next_release.md | 47 +++++----------------- CMakeGUDHIVersion.txt | 4 +- Dockerfile_gudhi_installation | 6 +-- 4 files changed, 54 insertions(+), 44 deletions(-) (limited to '.github') diff --git a/.github/for_maintainers/new_gudhi_version_creation.md b/.github/for_maintainers/new_gudhi_version_creation.md index 0dcb25fe..4de81b8a 100644 --- a/.github/for_maintainers/new_gudhi_version_creation.md +++ b/.github/for_maintainers/new_gudhi_version_creation.md @@ -88,8 +88,47 @@ ln -s @GUDHI_VERSION@ latest * Tick the *This is a pre-release* check button if this is a release candidate (untick if this is an official version) * Click the *Publish the release* button +## Pip package + +The pip package construction shall be started on release creation, you just have to check [gudhi github actions](https://github.com/GUDHI/gudhi-devel/actions) results. +The version number must be conform to [pep440](https://www.python.org/dev/peps/pep-0440/#pre-releases) + +## Conda package + +You have to fork [conda-forge/gudhi-feedstock](https://github.com/conda-forge/gudhi-feedstock). +The main changes consist into changing in the `recipe/meta.yaml`: +* `{% set version = "@GUDHI_VERSION@" %}` +* The cgal-cpp version number with the last one (you can find it [here](https://anaconda.org/conda-forge/cgal-cpp)) in the `host:` and the `run:` sections + +Create a Pull Request (PR) from this fork. +If you need to update conda tools (conda-build, conda-smithy, ...), add a comment in your PR saying `@conda-forge-admin, please rerender`, it will done automatically (do not forget to `git pull` the changes). + +## Docker image + +You have to modify the `Dockerfile_gudhi_installation` at the root of this repository in order to use the last release, cf. lines: +``` +... +RUN curl -LO "https://github.com/GUDHI/gudhi-devel/releases/download/tags%2Fgudhi-release-@GUDHI_VERSION@/gudhi.@GUDHI_VERSION@.tar.gz" \ +&& tar xf gudhi.@GUDHI_VERSION@.tar.gz \ +&& cd gudhi.@GUDHI_VERSION@ \ +... +``` + +Build and push images to docker hub: +``` +docker build -f Dockerfile_gudhi_installation -t gudhi/latest_gudhi_version:@GUDHI_VERSION@ . +docker run --rm -it gudhi/latest_gudhi_version:@GUDHI_VERSION@ +``` + +***[Check there are no error with utils and python version]*** + +``` +docker tag gudhi/latest_gudhi_version:@GUDHI_VERSION@ gudhi/latest_gudhi_version:latest +docker push gudhi/latest_gudhi_version:latest +docker push gudhi/latest_gudhi_version:@GUDHI_VERSION@ +``` + ## Mail sending Send version mail to the following lists : * gudhi-devel@lists.gforge.inria.fr * gudhi-users@lists.gforge.inria.fr (not for release candidate) - diff --git a/.github/next_release.md b/.github/next_release.md index 14546066..cd2376eb 100644 --- a/.github/next_release.md +++ b/.github/next_release.md @@ -1,47 +1,19 @@ -We are pleased to announce the release 3.3.0 of the GUDHI library. +We are pleased to announce the release 3.4.0 of the GUDHI library. -As a major new feature, the GUDHI library now offers a persistence-based clustering algorithm, weighted Rips complex using DTM -and edge collapse. +As a major new feature, the GUDHI library now offers ... -The GUDHI library is hosted on GitHub, do not hesitate to [fork the GUDHI project on GitHub](https://github.com/GUDHI/gudhi-devel). -From a user point of view, we recommend to download GUDHI user version (gudhi.3.3.0.tar.gz). +We are now using GitHub to develop the GUDHI library, do not hesitate to [fork the GUDHI project on GitHub](https://github.com/GUDHI/gudhi-devel). From a user point of view, we recommend to download GUDHI user version (gudhi.3.4.0.tar.gz). -Below is a list of changes made since GUDHI 3.2.0: +Below is a list of changes made since GUDHI 3.3.0: -- [DTM density estimator](https://gudhi.inria.fr/python/latest/point_cloud.html#module-gudhi.point_cloud.dtm) - - Python implementation of a density estimator based on the distance to the empirical measure defined by a point set. +- [Module](link) + - ... -- [DTM Rips complex](https://gudhi.inria.fr/python/latest/rips_complex_user.html#dtm-rips-complex) - - This Python implementation constructs a weighted Rips complex giving larger weights to outliers, - which reduces their impact on the persistence diagram - -- [Alpha complex](https://gudhi.inria.fr/python/latest/alpha_complex_user.html) - Python interface improvements - - 'fast' and 'exact' computations - - Delaunay complex construction by not setting filtration values - - Use the specific 3d alpha complex automatically to make the computations faster - -- [Clustering](https://gudhi.inria.fr/python/latest/clustering.html) - - Python implementation of [ToMATo](https://doi.org/10.1145/2535927), a persistence-based clustering algorithm - -- [Edge Collapse](https://gudhi.inria.fr/doc/latest/group__edge__collapse.html) of a filtered flag complex - - This C++ implementation reduces a filtration of Vietoris-Rips complex from its graph to another smaller - flag filtration with the same persistence. - -- [Bottleneck distance](https://gudhi.inria.fr/python/latest/bottleneck_distance_user.html) - - Python interface to [hera](https://github.com/grey-narn/hera)'s bottleneck distance - -- Persistence representations - - [Atol](https://gudhi.inria.fr/python/latest/representations.html#gudhi.representations.vector_methods.Atol) - is integrated in finite vectorisation methods. This - [article](https://www.fujitsu.com/global/about/resources/news/press-releases/2020/0316-01.html) talks about - applications using Atol. This module was originally available at - [https://github.com/martinroyer/atol](https://github.com/martinroyer/atol) - - Python interface change: [Wasserstein metrics](https://gudhi.inria.fr/python/latest/representations.html#gudhi.representations.metrics.WassersteinDistance) - is now [hera](https://github.com/grey-narn/hera) by default +- [Module](link) + - ... - Miscellaneous - - The [list of bugs that were solved since GUDHI-3.2.0](https://github.com/GUDHI/gudhi-devel/issues?q=label%3A3.3.0+is%3Aclosed) - is available on GitHub. + - The [list of bugs that were solved since GUDHI-3.3.0](https://github.com/GUDHI/gudhi-devel/issues?q=label%3A3.4.0+is%3Aclosed) is available on GitHub. All modules are distributed under the terms of the MIT license. However, there are still GPL dependencies for many modules. We invite you to check our [license dedicated web page](https://gudhi.inria.fr/licensing/) for further details. @@ -53,4 +25,3 @@ We provide [bibtex entries](https://gudhi.inria.fr/doc/latest/_citation.html) fo Feel free to [contact us](https://gudhi.inria.fr/contact/) in case you have any questions or remarks. For further information about downloading and installing the library ([C++](https://gudhi.inria.fr/doc/latest/installation.html) or [Python](https://gudhi.inria.fr/python/latest/installation.html)), please visit the [GUDHI web site](https://gudhi.inria.fr/). - diff --git a/CMakeGUDHIVersion.txt b/CMakeGUDHIVersion.txt index a08b7b4d..5f1eaacf 100644 --- a/CMakeGUDHIVersion.txt +++ b/CMakeGUDHIVersion.txt @@ -1,8 +1,8 @@ # Must be conform to pep440 - https://www.python.org/dev/peps/pep-0440/#pre-releases set (GUDHI_MAJOR_VERSION 3) -set (GUDHI_MINOR_VERSION 3) +set (GUDHI_MINOR_VERSION 4) # GUDHI_PATCH_VERSION can be 'ZaN' for Alpha release, 'ZbN' for Beta release, 'ZrcN' for release candidate or 'Z' for a final release. -set (GUDHI_PATCH_VERSION 0) +set (GUDHI_PATCH_VERSION 0a0) set(GUDHI_VERSION ${GUDHI_MAJOR_VERSION}.${GUDHI_MINOR_VERSION}.${GUDHI_PATCH_VERSION}) message(STATUS "GUDHI version : ${GUDHI_VERSION}") diff --git a/Dockerfile_gudhi_installation b/Dockerfile_gudhi_installation index 996dd06b..92430fce 100644 --- a/Dockerfile_gudhi_installation +++ b/Dockerfile_gudhi_installation @@ -58,9 +58,9 @@ RUN pip3 install \ # apt clean up RUN apt autoremove && rm -rf /var/lib/apt/lists/* -RUN curl -LO "https://github.com/GUDHI/gudhi-devel/releases/download/tags%2Fgudhi-release-3.2.0/gudhi.3.2.0.tar.gz" \ -&& tar xf gudhi.3.2.0.tar.gz \ -&& cd gudhi.3.2.0 \ +RUN curl -LO "https://github.com/GUDHI/gudhi-devel/releases/download/tags%2Fgudhi-release-3.3.0/gudhi.3.3.0.tar.gz" \ +&& tar xf gudhi.3.3.0.tar.gz \ +&& cd gudhi.3.3.0 \ && mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_PYTHON=OFF -DPython_ADDITIONAL_VERSIONS=3 .. \ && make all test install \ && cmake -DWITH_GUDHI_PYTHON=ON . \ -- 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') 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