Skip to content
This repository has been archived by the owner on Feb 9, 2021. It is now read-only.

fixes docker problem #237

Merged
merged 3 commits into from
Mar 11, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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_11 occt=7.2.0=occt7.2.0_0 python=3.6 pyparsing conda mock;
source ~/miniconda/bin/activate freecad_cq3;
else
sudo add-apt-repository -y ppa:freecad-maintainers/freecad-stable;
Expand Down
2 changes: 1 addition & 1 deletion build_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ cp examples/FreeCAD/Ex001_Simple_Block.py $CQ_TEST_DIR


fail_test( ){
"Test Failed."
echo "Test Failed."
}

echo "Running Tests..."
Expand Down
3 changes: 2 additions & 1 deletion cq_cmd.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand All @@ -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):
Expand Down