Merge pull request #248 from adam-urbanczyk/master

Implement CI on Windows
dcowden · Mar 27, 2018 · 66054b0 · 66054b0
2 parents 146ae81 + 45b6e1a
commit 66054b0
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -6,6 +6,7 @@ What is a CadQuery?
 ========================================
 
 [![Travis Build Status](https://travis-ci.org/dcowden/cadquery.svg?branch=master)](https://travis-ci.org/dcowden/cadquery?branch=master)
+[![Build status](https://ci.appveyor.com/api/projects/status/c7u4yjl8xxlokrw0/branch/master?svg=true)](https://ci.appveyor.com/project/jmwright/cadquery/branch/master)
 [![Coverage Status](https://coveralls.io/repos/github/dcowden/cadquery/badge.svg?branch=master)](https://coveralls.io/github/dcowden/cadquery?branch=master)
 [![GitHub version](https://d25lcipzij17d.cloudfront.net/badge.svg?id=gh&type=6&v=1.1.0&x2=0)](https://github.com/dcowden/cadquery/releases/tag/v1.1.0)
 [![License](https://img.shields.io/badge/license-Apache2-blue.svg)](https://github.com/dcowden/cadquery/blob/master/LICENSE)

diff --git a/appveyor.yml b/appveyor.yml
@@ -0,0 +1,21 @@
+build: false
+shallow_clone: true
+
+platform:
+    - x64
+
+environment:
+    matrix:
+        - PYTHON_VERSION: 3.6
+          MINICONDA_DIRNAME: C:\Miniconda36-x64
+
+install:
+    - set "PATH=%MINICONDA_DIRNAME%;%MINICONDA_DIRNAME%\\Scripts;%PATH%"
+    - conda config --set always_yes yes
+    - conda update -q conda
+    - conda create --quiet --name cqtest -c freecad -c conda-forge python=%PYTHON_VERSION% freecad=0.17=py36_vc14_13 occt=7.2.0 python=3.6 pyparsing mock
+    - activate cqtest
+    - python setup.py install
+
+test_script:
+    - python runtests.py
diff --git a/cadquery/freecad_impl/__init__.py b/cadquery/freecad_impl/__init__.py
@@ -63,10 +63,16 @@ def _fc_path():
 
     # Try to guess if using Anaconda
     if 'env' in sys.prefix:
-        _PATH = os.path.join(sys.prefix,'lib')
-        # return PATH if FreeCAD.[so,pyd] is present
-        if len(glob.glob(os.path.join(_PATH,'FreeCAD.*'))) > 0:
-            return _PATH
+        if sys.platform.startswith('linux'):
+            _PATH = os.path.join(sys.prefix,'lib')
+            # return PATH if FreeCAD.[so,pyd] is present
+            if len(glob.glob(os.path.join(_PATH,'FreeCAD.so'))) > 0:
+                return _PATH
+        elif sys.platform.startswith('win'):
+            _PATH = os.path.join(sys.prefix,'Library','bin')
+            # return PATH if FreeCAD.[so,pyd] is present
+            if len(glob.glob(os.path.join(_PATH,'FreeCAD.pyd'))) > 0:
+                return _PATH
 
     if sys.platform.startswith('linux'):
         # Make some dangerous assumptions...

diff --git a/tests/TestCadQuery.py b/tests/TestCadQuery.py
@@ -3,7 +3,7 @@
 
 """
 #system modules
-import math,sys,os.path,time
+import math,os.path,time,tempfile
 
 #my modules
 from cadquery import *
@@ -19,11 +19,7 @@
 from cadquery.freecad_impl import suppress_stdout_stderr
 
 #where unit test output will be saved
-import sys
-if sys.platform.startswith("win"):
-    OUTDIR = "c:/temp"
-else:
-    OUTDIR = "/tmp"
+OUTDIR = tempfile.gettempdir()
 SUMMARY_FILE = os.path.join(OUTDIR,"testSummary.html")
 
 SUMMARY_TEMPLATE="""<html>

diff --git a/tests/TestImporters.py b/tests/TestImporters.py
@@ -2,7 +2,7 @@
     Tests file importers such as STEP
 """
 #core modules
-import io
+import tempfile
 
 from cadquery import *
 from cadquery import exporters
@@ -11,12 +11,7 @@
 from tests import BaseTest
 
 #where unit test output will be saved
-import sys
-if sys.platform.startswith("win"):
-    OUTDIR = "c:/temp"
-else:
-    OUTDIR = "/tmp"
-
+OUTDIR = tempfile.gettempdir()
 
 class TestImporters(BaseTest):
     def importBox(self, importType, fileName):