revert more

.github/workflows/build.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, macos-latest]
         python: ["3.10", "3.11", "3.12"]
 
     steps:

setup.py

@@ -64,7 +64,7 @@ def get_scip_library():
                 "src/skeletonization.cpp",
                 "src/reconstruction.cpp",
                 "src/polygonal_surface_reconstruction.cpp",
-                "src/straight_skeleton_2.cpp",
+                # "src/straight_skeleton_2.cpp",
             ]
         ),
         include_dirs=["./include", get_eigen_include(), get_pybind_include()],

src/compas_cgal.cpp

@@ -12,11 +12,11 @@ void init_subdivision(pybind11::module &);
 void init_skeletonization(pybind11::module &);
 void init_reconstruction(pybind11::module &);
 void init_polygonal_surface_reconstruction(pybind11::module &);
-void init_straight_skeleton_2(pybind11::module &);
+// void init_straight_skeleton_2(pybind11::module &);
 
-// the first parameter here ("cgal") will be the name of the "so" or "pyd" file that will be produced by PyBind11
+// the first parameter here ("_cgal") will be the name of the "so" or "pyd" file that will be produced by PyBind11
 // which is the entry point from where all other modules will be accessible.
-PYBIND11_MODULE(cgal, m)
+PYBIND11_MODULE(_cgal, m)
 {
     m.doc() = "";
 
@@ -31,5 +31,5 @@ PYBIND11_MODULE(cgal, m)
     init_skeletonization(m);
     init_reconstruction(m);
     init_polygonal_surface_reconstruction(m);
-    init_straight_skeleton_2(m);
+    // init_straight_skeleton_2(m);
 }

src/compas_cgal/booleans.py

@@ -3,7 +3,7 @@
 import numpy as np
 from compas.plugins import plugin
 
-from compas_cgal.cgal import booleans
+from compas_cgal._cgal import booleans
 
 from .types import VerticesFaces
 from .types import VerticesFacesNumpy

src/compas_cgal/intersections.py

@@ -1,7 +1,7 @@
 import numpy as np
 from compas.plugins import plugin
 
-from compas_cgal.cgal import intersections
+from compas_cgal._cgal import intersections
 
 from .types import PolylinesNumpy
 from .types import VerticesFaces

src/compas_cgal/measure.py

@@ -1,7 +1,7 @@
 import numpy as np
 from compas.plugins import plugin
 
-from compas_cgal.cgal import measure
+from compas_cgal._cgal import measure
 
 from .types import VerticesFaces
 

src/compas_cgal/meshing.py

@@ -1,7 +1,7 @@
 import numpy as np
 from compas.plugins import plugin
 
-from compas_cgal.cgal import meshing
+from compas_cgal._cgal import meshing
 
 from .types import VerticesFaces
 from .types import VerticesFacesNumpy

src/compas_cgal/polygonal_surface_reconstruction.py

@@ -4,7 +4,7 @@
 from compas.geometry import Point
 from compas.geometry import Vector
 
-from compas_cgal.cgal import polygonal_surface_reconstruction
+from compas_cgal._cgal import polygonal_surface_reconstruction
 
 from .types import FloatNx3
 

src/compas_cgal/reconstruction.py

@@ -5,7 +5,7 @@
 from compas.geometry import Point
 from compas.geometry import Vector
 
-from compas_cgal.cgal import reconstruction
+from compas_cgal._cgal import reconstruction
 
 from .types import FloatNx3
 from .types import IntNx3

src/compas_cgal/skeletonization.py

@@ -1,6 +1,6 @@
 import numpy as np
 
-from compas_cgal.cgal import skeletonization
+from compas_cgal._cgal import skeletonization
 
 from .types import PolylinesNumpy
 from .types import VerticesFaces

src/compas_cgal/slicer.py

@@ -1,7 +1,7 @@
 import numpy as np
 from compas.plugins import plugin
 
-from compas_cgal.cgal import slicer
+from compas_cgal._cgal import slicer
 
 from .types import Planes
 from .types import PolylinesNumpy