Make 3D models compatible with latest CadQuery

3d/mount.py

@@ -10,11 +10,15 @@
 
 
 def circle_points(number, circle, shift=0):
-    radius = circle / 2.
+    radius = circle / 2.0
     step = 360 / number
-    points = [(radius * sin(radians(i * step + shift)),
-               radius * cos(radians(i * step + shift)))
-              for i in range(number)]
+    points = [
+        (
+            radius * sin(radians(i * step + shift)),
+            radius * cos(radians(i * step + shift)),
+        )
+        for i in range(number)
+    ]
     return points
 
 
@@ -44,29 +48,43 @@ def circle_points(number, circle, shift=0):
 
 
 # Basic mount structure
-mount = cadquery.Workplane('XY').box(MOUNT_WIDTH, MOUNT_HEIGHT, MOUNT_THICK)
+mount = cadquery.Workplane("XY").box(MOUNT_WIDTH, MOUNT_HEIGHT, MOUNT_THICK)
 
 # Base screws
-mount = mount.faces('<Y').workplane()\
-    .pushPoints([(-SCREW_SPACE / 2., 0), (SCREW_SPACE / 2., 0)])\
+mount = (
+    mount.faces("<Y")
+    .workplane()
+    .pushPoints([(-SCREW_SPACE / 2.0, 0), (SCREW_SPACE / 2.0, 0)])
     .hole(SCREW_DIAMETER)
+)
 
 # Motor holes
 miniholes = circle_points(number=6, circle=MOUNT_MINIHOLES_CIRCLE)
-mount = mount.faces('<Z').workplane()\
-    .pushPoints(miniholes)\
+mount = (
+    mount.faces("<Z")
+    .workplane(centerOption="CenterOfMass")
+    .pushPoints(miniholes)
     .hole(diameter=MOUNT_MINIHOLES_DIAMETER)
-mount = mount.faces('>Z').workplane().cboreHole(
-    MOTOR_HOLE_DIAMETER,
-    MOTOR_DIAMETER + 1,
-    MOUNT_THICK - MOTOR_MOUNT_THICK)
+)
+mount = (
+    mount.faces(">Z")
+    .workplane()
+    .cboreHole(
+        MOTOR_HOLE_DIAMETER,
+        MOTOR_DIAMETER + 1,
+        MOUNT_THICK - MOTOR_MOUNT_THICK,
+    )
+)
 
 # Axis
-axis_shift = (MODULE * (Z_PINION + Z_GEAR)) / 2.
+axis_shift = (MODULE * (Z_PINION + Z_GEAR)) / 2.0
 axis_shift *= cos(asin(MOTOR_SHIFT / axis_shift))
-mount = mount.faces('<Z').workplane()\
-    .pushPoints([(axis_shift, -MOTOR_SHIFT), (-axis_shift, -MOTOR_SHIFT)])\
+mount = (
+    mount.faces("<Z")
+    .workplane()
+    .pushPoints([(axis_shift, -MOTOR_SHIFT), (-axis_shift, -MOTOR_SHIFT)])
     .hole(AXIS_DIAMETER)
+)
 
 # Fillet
-mount = mount.edges('|Z').fillet(MOUNT_FILLET)
+mount = mount.edges("|Z").fillet(MOUNT_FILLET)

3d/rim.py

@@ -8,11 +8,11 @@
 import cadquery
 
 
-REEL_D0 = 19.
-REEL_H0 = 5.
+REEL_D0 = 19.0
+REEL_H0 = 5.0
 
 REEL_D1 = 14.8
-REEL_H1 = 3.
+REEL_H1 = 3.0
 
 BEARING_D = 6.2
 
@@ -21,17 +21,28 @@
 
 
 # Rim body
-rim = cadquery.Workplane('XY')\
-    .circle(radius=REEL_D0 / 2.).extrude(distance=REEL_H0)\
-    .faces('>Z').workplane()\
-    .circle(radius=REEL_D1 / 2.).extrude(distance=REEL_H1)\
-    .faces('>Z').workplane()\
+rim = (
+    cadquery.Workplane("XY")
+    .circle(radius=REEL_D0 / 2.0)
+    .extrude(distance=REEL_H0)
+    .faces(">Z")
+    .workplane()
+    .circle(radius=REEL_D1 / 2.0)
+    .extrude(distance=REEL_H1)
+    .faces(">Z")
+    .workplane()
     .hole(diameter=BEARING_D)
+)
 
 # Mini-holes
-minihole_position = (REEL_D1 + BEARING_D) / 4.
-miniholes = [(minihole_position * sin(radians(i * 360. / MINIHOLES)),
-              minihole_position * cos(radians(i * 360. / MINIHOLES)))
-             for i in range(MINIHOLES)]
-rim = rim.faces('>Z').workplane()\
-    .pushPoints(miniholes).hole(diameter=MINIHOLE_D)
+minihole_position = (REEL_D1 + BEARING_D) / 4.0
+miniholes = [
+    (
+        minihole_position * sin(radians(i * 360.0 / MINIHOLES)),
+        minihole_position * cos(radians(i * 360.0 / MINIHOLES)),
+    )
+    for i in range(MINIHOLES)
+]
+rim = (
+    rim.faces(">Z").workplane().pushPoints(miniholes).hole(diameter=MINIHOLE_D)
+)

environment.yaml

@@ -4,7 +4,7 @@ channels:
   - cadquery
 dependencies:
   - python=3.6
-  - cadquery=2
+  - cadquery=2.1
   - pip
   - pip:
     - bokeh
@@ -27,6 +27,7 @@ dependencies:
     # Test
     - pytest
     # Lint
+    - black
     - flake8
     - flake8-quotes
     # Documentation

pyproject.toml

@@ -0,0 +1,2 @@
+[tool.black]
+line-length = 79