Merge pull request #176 from fusion-energy/updates_for_cq_2.2

Updates for cq 2.2

paramak/parametric_components/toroidal_field_coil_coat_hanger.py

@@ -5,7 +5,9 @@
 import numpy as np
 
 from paramak import ExtrudeStraightShape
-from paramak.utils import calculate_wedge_cut, rotate
+from paramak.utils import calculate_wedge_cut, rotate, patch_workplane
+
+patch_workplane()
 
 
 class ToroidalFieldCoilCoatHanger(ExtrudeStraightShape):
@@ -222,7 +224,7 @@ def create_solid(self):
 
         self.wire = wire
 
-        solid = wire.extrude(distance=-self.distance / 2.0, both=True)
+        solid = wire.extrude(until=-self.distance / 2.0, both=True)
 
         solid = self.rotate_solid(solid)
 
@@ -233,7 +235,7 @@ def create_solid(self):
             inner_leg_solid = cq.Workplane(self.workplane)
             inner_leg_solid = inner_leg_solid.polyline(self.inner_leg_connection_points)
             inner_leg_solid = inner_leg_solid.close().extrude(
-                distance=-self.distance / 2.0, both=True
+                until=-self.distance / 2.0, both=True
             )
 
             inner_leg_solid = self.rotate_solid(inner_leg_solid)

paramak/parametric_components/toroidal_field_coil_rectangle.py

@@ -4,7 +4,9 @@
 import numpy as np
 
 from paramak import ExtrudeStraightShape
-from paramak.utils import calculate_wedge_cut
+from paramak.utils import calculate_wedge_cut, patch_workplane
+
+patch_workplane()
 
 
 class ToroidalFieldCoilRectangle(ExtrudeStraightShape):
@@ -129,7 +131,7 @@ def create_solid(self):
 
         self.wire = wire
 
-        solid = wire.extrude(distance=-self.distance / 2.0, both=True)
+        solid = wire.extrude(until=-self.distance / 2.0, both=True)
 
         solid = self.rotate_solid(solid)
 
@@ -140,7 +142,7 @@ def create_solid(self):
             inner_leg_solid = cq.Workplane(self.workplane)
             inner_leg_solid = inner_leg_solid.polyline(self.inner_leg_connection_points)
             inner_leg_solid = inner_leg_solid.close().extrude(
-                distance=-self.distance / 2.0, both=True
+                until=-self.distance / 2.0, both=True
             )
 
             inner_leg_solid = self.rotate_solid(inner_leg_solid)

paramak/parametric_components/toroidal_field_coil_round_corners.py

@@ -4,7 +4,9 @@
 import numpy as np
 
 from paramak.parametric_shapes.extruded_mixed_shape import ExtrudeMixedShape
-from paramak.utils import calculate_wedge_cut
+from paramak.utils import calculate_wedge_cut, patch_workplane
+
+patch_workplane()
 
 
 class ToroidalFieldCoilRectangleRoundCorners(ExtrudeMixedShape):
@@ -362,7 +364,7 @@ def create_solid(self):
             .consolidateWires()
         )
 
-        solid = wire.extrude(distance=-self._distance / 2, both=True)
+        solid = wire.extrude(until=-self._distance / 2, both=True)
         solid = self.rotate_solid(solid)
 
         cutting_wedge = calculate_wedge_cut(self)
@@ -375,7 +377,7 @@ def create_solid(self):
             inner_leg_solid = (
                 inner_leg_solid.polyline(self._inner_leg_connection_points)
                 .close()
-                .extrude(distance=-self._distance / 2, both=True)
+                .extrude(until=-self._distance / 2, both=True)
             )
 
             inner_leg_solid = self.rotate_solid(inner_leg_solid)

paramak/parametric_shapes/extruded_circle_shape.py

@@ -3,7 +3,9 @@
 from cadquery import Workplane
 
 from paramak import Shape
-from paramak.utils import calculate_wedge_cut
+from paramak.utils import calculate_wedge_cut, patch_workplane
+
+patch_workplane()
 
 
 class ExtrudeCircleShape(Shape):
@@ -102,7 +104,7 @@ def create_solid(self):
 
         self.wire = wire
 
-        solid = wire.extrude(distance=extrusion_distance, both=self.extrude_both)
+        solid = wire.extrude(until=extrusion_distance, both=self.extrude_both)
 
         solid = self.rotate_solid(solid)
         cutting_wedge = calculate_wedge_cut(self)

paramak/parametric_shapes/extruded_mixed_shape.py

@@ -1,7 +1,9 @@
 from typing import Optional, Tuple
 
 from paramak import Shape
-from paramak.utils import calculate_wedge_cut
+from paramak.utils import calculate_wedge_cut, patch_workplane
+
+patch_workplane()
 
 
 class ExtrudeMixedShape(Shape):
@@ -83,7 +85,7 @@ def create_solid(self):
 
         self.wire = wire
 
-        solid = wire.extrude(distance=extrusion_distance, both=self.extrude_both)
+        solid = wire.extrude(until=extrusion_distance, both=self.extrude_both)
 
         # filleting rectangular port cutter edges
         # must be done before azimuthal placement

paramak/utils.py

@@ -801,3 +801,20 @@ def filter(self, object_list):
                 new_obj_list.append(obj)
         print("length(new_obj_list)", len(new_obj_list))
         return new_obj_list
+
+
+def patch_workplane():
+    """Going from CadQuery 2.1 to 2.2, the 'distance' arg to extrude was renamed 'until'.
+    This patch ensures that either version works fine using 'until'.
+    """
+    from cadquery import Workplane
+
+    if "distance" in Workplane.extrude.__code__.co_varnames:
+        extrude_func = Workplane.extrude
+
+        def extrude(*args, **kwargs):
+            if "until" in kwargs.keys():
+                kwargs["distance"] = kwargs.pop("until")
+            return extrude_func(*args, **kwargs)
+
+        Workplane.extrude = extrude