Fix build

scottbez1 · May 13, 2021 · 710c76d · 710c76d
1 parent e5edbed
commit 710c76d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/3d.yml b/.github/workflows/3d.yml
@@ -27,17 +27,17 @@ jobs:
 
       - name: Generate 2d output (Ponoko 3mm MDF)
         run: |
-          xvfb-run --auto-servernum --server-args "-screen 0 1024x768x24" python -u 3d/scripts/generate_2d.py --render-raster --kerf-preset ponoko-3mm-mdf
+          xvfb-run --auto-servernum --server-args "-screen 0 1024x768x24" python3 -u 3d/scripts/generate_2d.py --render-raster --kerf-preset ponoko-3mm-mdf
           cp 3d/build/laser_parts/combined.svg 3d/build/outputs/3d_laser_vector-ponoko-3mm-mdf.svg
 
       - name: Generate 2d output (Ponoko 3mm Acrylic)
         run: |
-          xvfb-run --auto-servernum --server-args "-screen 0 1024x768x24" python -u 3d/scripts/generate_2d.py --render-raster --kerf-preset ponoko-3mm-acrylic
+          xvfb-run --auto-servernum --server-args "-screen 0 1024x768x24" python3 -u 3d/scripts/generate_2d.py --render-raster --kerf-preset ponoko-3mm-acrylic
           cp 3d/build/laser_parts/combined.svg 3d/build/outputs/3d_laser_vector-ponoko-3mm-acrylic.svg
 
       - name: Generate animated gif
         run: |
-          xvfb-run --auto-servernum --server-args "-screen 0 1024x768x24" python -u 3d/scripts/generate_gif.py
+          xvfb-run --auto-servernum --server-args "-screen 0 1024x768x24" python3 -u 3d/scripts/generate_gif.py
           cp 3d/build/animation/animation.gif 3d/build/outputs/3d_animation.gif
 
       - name: Generate STLs for web viewer

diff --git a/3d/scripts/openscad.py b/3d/scripts/openscad.py
@@ -67,7 +67,7 @@ def run(
 
     if variables is not None:
         for k, v in variables.items():
-            if isinstance(v, basestring) or isinstance(v, bytes):
+            if isinstance(v, str) or isinstance(v, bytes):
                 try:
                     v = v.decode('utf-8')
                 except (UnicodeDecodeError, AttributeError):