Merge pull request #1177 from sethfischer/typing-add-fixed-to-constraint-kinds

Add "Fixed" to ConstraintKinds type definition

Author: jmwright

cadquery/assembly.py

@@ -9,6 +9,7 @@
 from .occ_impl.geom import Location
 from .occ_impl.assembly import Color
 from .occ_impl.solver import (
+    ConstraintKind,
     ConstraintSolver,
     ConstraintSpec as Constraint,
     UnaryConstraintKind,
@@ -26,7 +27,6 @@
 
 # type definitions
 AssemblyObjects = Union[Shape, Workplane, None]
-ConstraintKinds = Literal["Plane", "Point", "Axis", "PointInPlane"]
 ExportLiterals = Literal["STEP", "XML", "GLTF", "VTKJS", "VRML"]
 
 PATH_DELIM = "/"
@@ -278,14 +278,12 @@ def _subloc(self, name: str) -> Tuple[Location, str]:
 
     @overload
     def constrain(
-        self, q1: str, q2: str, kind: ConstraintKinds, param: Any = None
+        self, q1: str, q2: str, kind: ConstraintKind, param: Any = None
     ) -> "Assembly":
         ...
 
     @overload
-    def constrain(
-        self, q1: str, kind: ConstraintKinds, param: Any = None
-    ) -> "Assembly":
+    def constrain(self, q1: str, kind: ConstraintKind, param: Any = None) -> "Assembly":
         ...
 
     @overload
@@ -295,14 +293,14 @@ def constrain(
         s1: Shape,
         id2: str,
         s2: Shape,
-        kind: ConstraintKinds,
+        kind: ConstraintKind,
         param: Any = None,
     ) -> "Assembly":
         ...
 
     @overload
     def constrain(
-        self, id1: str, s1: Shape, kind: ConstraintKinds, param: Any = None,
+        self, id1: str, s1: Shape, kind: ConstraintKind, param: Any = None,
     ) -> "Assembly":
         ...