From f8b44f62fa9b5f06d0ec3b786f463dff6c27f8f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Wed, 5 Oct 2022 17:48:28 +0200 Subject: [PATCH 01/11] alpha wrap is available starting CGAL 5.5 --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 79ed21aa4..fe89242e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -193,7 +193,9 @@ if ( CGAL_FOUND AND ${CGAL_MAJOR_VERSION} GREATER 4 ) add_subdirectory(SWIG_CGAL/Triangulation_2) add_subdirectory(SWIG_CGAL/Polyhedron_3) add_subdirectory(SWIG_CGAL/Alpha_shape_2) - add_subdirectory(SWIG_CGAL/Alpha_wrap_3) + if (CGAL_VERSION VERSION_GREATER 5.4) + add_subdirectory(SWIG_CGAL/Alpha_wrap_3) + endif() add_subdirectory(SWIG_CGAL/Spatial_searching) add_subdirectory(SWIG_CGAL/AABB_tree) if (CGAL_ImageIO_FOUND) From 9125ca2769256a178825696eeb6baccec9e8f346 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 6 Oct 2022 10:04:10 +0200 Subject: [PATCH 02/11] s/python/Python/ --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 258fb9c75..41dd54682 100644 --- a/setup.py +++ b/setup.py @@ -116,7 +116,7 @@ def get_options(): ('cmake-prefix-path=', None, 'Specify the path to a directory that can be used as CMAKE_PREFIX_PATH, that would contain all headers and libraries. '), ('generator=', None, 'The generator to use for cmake.'), ('python-executable=', None, 'The path to the python executable.'), - ('python-root=', None, 'The path to the python root directory.'), + ('python-root=', None, 'The path to the Python root directory.'), ('cmake=', None, 'Specify the path to the cmake executable.') ] @@ -401,8 +401,8 @@ def run(self): setup(name='cgal', version=os.environ.get('CGAL_PYTHON_MODULE_VERSION') or '5.4.1', author="CGAL Project", - description="CGAL bindings, allowing to use some of the CGAL library in python.", - long_description="The CGAL Bindings project allows to use some packages of CGAL, the Computational Algorithms Library with python. This project is still experimental and more packages will be added. For more information, please visit https://github.com/CGAL/cgal-swig-bindings/wiki.", + description="CGAL bindings, allowing to use some of the CGAL library in Python.", + long_description="The CGAL Bindings project allows to use some packages of CGAL, the Computational Algorithms Library with Python. This project is still experimental and more packages will be added. For more information, please visit https://github.com/CGAL/cgal-swig-bindings/wiki.", long_description_content_type="text/markdown", packages=['CGAL'], package_dir = { 'CGAL': '.' }, From ae350a330301c4a5b10e49baf7d3299437c0085d Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 12 Oct 2022 17:24:04 +0200 Subject: [PATCH 03/11] Compile with CGAL-5.5.1 --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c602719cf..19d4f3561 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -47,7 +47,7 @@ jobs: strategy: fail-fast: false matrix: - cgal_branch: [v5.5, 5.5.x-branch, master] + cgal_branch: [v5.5.1, 5.5.x-branch, master] #cgal_branch: [v5.5] os: [ubuntu-latest, macos-latest, windows-latest] #os: [windows-latest] From 7d44c1d96227ac86bbcef99c96bfa448ffeba819 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 13 Oct 2022 16:17:31 +0200 Subject: [PATCH 04/11] Add --verbose for the upload to TestPyPI --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 19d4f3561..e3ec2626b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -211,7 +211,7 @@ jobs: TWINE_PASSWORD: ${{ secrets.TEST_PYPI_PASSWORD }} run: | pip install twine - python3 -m twine upload --repository testpypi dist/* + python3 -m twine upload --verbose --repository testpypi dist/* - name: upload to PyPI if: github.event_name == 'push' && github.ref_name == 'main' From 38a9b230cc782f27c6ed90a31fbadb68f43f9e5c Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 14 Oct 2022 09:35:17 +0200 Subject: [PATCH 05/11] Rename jobs --- .github/workflows/tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e3ec2626b..7a4629c23 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -42,18 +42,18 @@ jobs: path: dist/*.tar.gz build-and-test-wheels: - name: Create and Test Wheels + name: Wheel runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: cgal_branch: [v5.5.1, 5.5.x-branch, master] #cgal_branch: [v5.5] + python-version: ['3.7', '3.8', '3.9', '3.10'] + #python-version: ["3.9"] os: [ubuntu-latest, macos-latest, windows-latest] #os: [windows-latest] #os: [ubuntu-latest] - python-version: ['3.7', '3.8', '3.9', '3.10'] - #python-version: ["3.9"] steps: - uses: actions/checkout@v2 From ba9d1efd14fb9d932325a5a3138f0396a5bac3a2 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 14 Oct 2022 09:35:36 +0200 Subject: [PATCH 06/11] Do not try to push from pull-requests --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7a4629c23..c4cd92374 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -206,6 +206,7 @@ jobs: path: dist - name: upload to TestPyPI + if: github.event_name == 'push' && github.ref_name == 'main' env: TWINE_USERNAME: __token__ TWINE_PASSWORD: ${{ secrets.TEST_PYPI_PASSWORD }} From de61f0b44b46a39bacf86dbd1dda645e5b5d84a1 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 14 Oct 2022 12:07:09 +0200 Subject: [PATCH 07/11] Update LATEST_CGAL_VERSION --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c4cd92374..c533bf81a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,7 +7,7 @@ on: pull_request: env: - LATEST_CGAL_VERSION: '5.5' + LATEST_CGAL_VERSION: '5.5.1' jobs: sdist: From 302facfc7dfb3ab7b5e71e766b35c10ec0417545 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 19 Oct 2022 10:18:24 +0200 Subject: [PATCH 08/11] Add dependabot config for Github Actions [no ci] --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..5ace4600a --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" From 7f498ed475c432f6990307c10a435d30e98d8eb9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 08:19:48 +0000 Subject: [PATCH 09/11] Bump actions/download-artifact from 2 to 3 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 2 to 3. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c533bf81a..5b345538d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -200,7 +200,7 @@ jobs: runs-on: ubuntu-latest needs: [sdist, build-and-test-wheels] steps: - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v3 with: name: artifact path: dist From c415f69d759237c93e1c41ca96a992a8cf09bdf9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 08:19:52 +0000 Subject: [PATCH 10/11] Bump actions/setup-python from 2 to 4 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2 to 4. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v2...v4) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c533bf81a..8b27478c3 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -19,7 +19,7 @@ jobs: fetch-depth: 1 - name: Install Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: '3.10' From ed2ce67af724d79b3be0bb671d1160d20d106c77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 08:19:55 +0000 Subject: [PATCH 11/11] Bump actions/upload-artifact from 2 to 3 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c533bf81a..7a5a97b16 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -37,7 +37,7 @@ jobs: export CGAL_PYTHON_MODULE_VERSION python3 setup.py sdist - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: path: dist/*.tar.gz @@ -190,7 +190,7 @@ jobs: python $i done - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 if: endsWith(matrix.cgal_branch, env.LATEST_CGAL_VERSION) with: path: cgal-*.whl