add no-pluggable scenario

Author: tomvanmele

src/compas_occ/geometry/curves/__init__.py

@@ -1,35 +1,33 @@
-# import inspect
-from compas.plugins import plugin
-from compas.geometry import NurbsCurve
-
 from .nurbs import OCCNurbsCurve
 
-
-@plugin(category='factories', requires=['compas_occ'])
-def new_nurbscurve(cls, *args, **kwargs):
-    # for _, value in inspect.getmembers(OCCNurbsCurve):
-    #     if inspect.isfunction(value):
-    #         if hasattr(value, '__isabstractmethod__'):
-    #             raise Exception('Abstract method not implemented: {}'.format(value))
-
-    return super(NurbsCurve, OCCNurbsCurve).__new__(OCCNurbsCurve)
-
-
-@plugin(category='factories', requires=['compas_occ'])
-def new_nurbscurve_from_parameters(*args, **kwargs):
-    return OCCNurbsCurve.from_parameters(*args, **kwargs)
-
-
-@plugin(category='factories', requires=['compas_occ'])
-def new_nurbscurve_from_points(*args, **kwargs):
-    return OCCNurbsCurve.from_points(*args, **kwargs)
-
-
-@plugin(category='factories', requires=['compas_occ'])
-def new_nurbscurve_from_interpolation(cls, *args, **kwargs):
-    return OCCNurbsCurve.from_interpolation(*args, **kwargs)
-
-
-@plugin(category='factories', requires=['compas_occ'])
-def new_nurbscurve_from_step(cls, *args, **kwargs):
-    return OCCNurbsCurve.from_step(*args, **kwargs)
+try:
+    from compas.geometry import NurbsCurve
+except ImportError:
+    pass
+else:
+    from compas.plugins import plugin
+
+    @plugin(category='factories', requires=['compas_occ'])
+    def new_nurbscurve(cls, *args, **kwargs):
+        # for _, value in inspect.getmembers(OCCNurbsCurve):
+        #     if inspect.isfunction(value):
+        #         if hasattr(value, '__isabstractmethod__'):
+        #             raise Exception('Abstract method not implemented: {}'.format(value))
+
+        return super(NurbsCurve, OCCNurbsCurve).__new__(OCCNurbsCurve)
+
+    @plugin(category='factories', requires=['compas_occ'])
+    def new_nurbscurve_from_parameters(*args, **kwargs):
+        return OCCNurbsCurve.from_parameters(*args, **kwargs)
+
+    @plugin(category='factories', requires=['compas_occ'])
+    def new_nurbscurve_from_points(*args, **kwargs):
+        return OCCNurbsCurve.from_points(*args, **kwargs)
+
+    @plugin(category='factories', requires=['compas_occ'])
+    def new_nurbscurve_from_interpolation(cls, *args, **kwargs):
+        return OCCNurbsCurve.from_interpolation(*args, **kwargs)
+
+    @plugin(category='factories', requires=['compas_occ'])
+    def new_nurbscurve_from_step(cls, *args, **kwargs):
+        return OCCNurbsCurve.from_step(*args, **kwargs)

src/compas_occ/geometry/curves/nurbs.py

@@ -6,9 +6,13 @@
 from compas.geometry import Frame
 from compas.geometry import Circle
 from compas.geometry import Box
-from compas.geometry import NurbsCurve
 from compas.utilities import linspace
 
+try:
+    from compas.geometry import NurbsCurve
+except ImportError:
+    from compas.geometry import Geometry as NurbsCurve
+
 from compas_occ.conversions import harray1_from_points1
 from compas_occ.conversions import array1_from_points1
 from compas_occ.conversions import array1_from_floats1

src/compas_occ/geometry/surfaces/__init__.py

@@ -1,30 +1,28 @@
-from compas.plugins import plugin
-from compas.geometry import NurbsSurface
-
 from .nurbs import OCCNurbsSurface
 
+try:
+    from compas.geometry import NurbsSurface
+except ImportError:
+    pass
+else:
+    from compas.plugins import plugin
 
-@plugin(category='factories', requires=['compas_occ'])
-def new_nurbssurface(cls, *args, **kwargs):
-    return super(NurbsSurface, OCCNurbsSurface).__new__(OCCNurbsSurface)
-
-
-@plugin(category='factories', requires=['compas_occ'])
-def new_nurbssurface_from_parameters(*args, **kwargs):
-    return OCCNurbsSurface.from_parameters(*args, **kwargs)
-
-
-@plugin(category='factories', requires=['compas_occ'])
-def new_nurbssurface_from_points(*args, **kwargs):
-    return OCCNurbsSurface.from_points(*args, **kwargs)
-
+    @plugin(category='factories', requires=['compas_occ'])
+    def new_nurbssurface(cls, *args, **kwargs):
+        return super(NurbsSurface, OCCNurbsSurface).__new__(OCCNurbsSurface)
 
-@plugin(category='factories', requires=['compas_occ'])
-def new_nurbssurface_from_fill(cls, *args, **kwargs):
-    return OCCNurbsSurface.from_fill(*args, **kwargs)
+    @plugin(category='factories', requires=['compas_occ'])
+    def new_nurbssurface_from_parameters(*args, **kwargs):
+        return OCCNurbsSurface.from_parameters(*args, **kwargs)
 
+    @plugin(category='factories', requires=['compas_occ'])
+    def new_nurbssurface_from_points(*args, **kwargs):
+        return OCCNurbsSurface.from_points(*args, **kwargs)
 
-@plugin(category='factories', requires=['compas_occ'])
-def new_nurbssurface_from_step(cls, *args, **kwargs):
-    return OCCNurbsSurface.from_step(*args, **kwargs)
+    @plugin(category='factories', requires=['compas_occ'])
+    def new_nurbssurface_from_fill(cls, *args, **kwargs):
+        return OCCNurbsSurface.from_fill(*args, **kwargs)
 
+    @plugin(category='factories', requires=['compas_occ'])
+    def new_nurbssurface_from_step(cls, *args, **kwargs):
+        return OCCNurbsSurface.from_step(*args, **kwargs)

src/compas_occ/geometry/surfaces/nurbs.py

@@ -24,7 +24,10 @@
 
 from ..curves import OCCNurbsCurve
 
-from compas.geometry import NurbsSurface
+try:
+    from compas.geometry import NurbsSurface
+except ImportError:
+    from compas.geometry import Geometry as NurbsSurface
 
 from OCC.Core.gp import gp_Trsf
 from OCC.Core.gp import gp_Pnt