Merge branch 'main' into pr/lrineau/215

# Conflicts:
#	.github/workflows/tests.yml

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.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:
@@ -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'
 
@@ -37,23 +37,23 @@ 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
 
   build-and-test-wheels:
-    name: Create and Test Wheels
+    name: Wheel
     runs-on: ${{ matrix.os }}
     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]
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        #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', '3.11']
-        #python-version: ["3.9"]
 
     steps:
       - uses: actions/checkout@v2
@@ -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
@@ -200,18 +200,19 @@ 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
 
       - name: upload to TestPyPI
+        if: github.event_name == 'push' && github.ref_name == 'main'
         env:
           TWINE_USERNAME: __token__
           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'

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)

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': '.' },