Merge 12224b6 into eb199ba

dcowden · Mar 10, 2018 · e6d95db · e6d95db
2 parents eb199ba + 12224b6
commit e6d95db
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,7 @@ before_install:
     conda config --set always_yes yes --set changeps1 no;
     conda update -q conda;
     conda info -a;
-    conda create -y -q -n freecad_cq3 -c freecad -c conda-forge freecad=0.17=py36_11 python=3.6 pyparsing conda mock;
+    conda create -y -q -n freecad_cq3 -c freecad -c conda-forge freecad=0.17=py36_12 python=3.6 pyparsing conda mock;
     source ~/miniconda/bin/activate freecad_cq3;
   else
     sudo add-apt-repository -y ppa:freecad-maintainers/freecad-stable;

diff --git a/build_docker.sh b/build_docker.sh
@@ -12,7 +12,7 @@ cp examples/FreeCAD/Ex001_Simple_Block.py $CQ_TEST_DIR
 
 
 fail_test(  ){
-   "Test Failed."
+   echo "Test Failed."
 }
 
 echo "Running Tests..."

diff --git a/cq_cmd.py b/cq_cmd.py
@@ -6,7 +6,7 @@
 # if no output filename is provided, output goes to stdout
 # default output format is STEP
 #
-
+from __future__ import print_function
 import sys,os
 
 
@@ -21,6 +21,7 @@
 import json
 import tempfile
 
+
 class FilepathShapeWriter(object):
     #a shape writer that writes a new file in a directory for each object
     def __init__(self,file_pattern, shape_format):