Merge pull request ronpandolfi#13 from lbl-camera/appveyor_fixes

Fix to add pyqt5 to Appveyor environment

Xi-cam.spec

@@ -1,4 +1,5 @@
 # -*- mode: python -*-
+# Usage: pyinstall --path=C:\Windows\System32\downlevel Xi-cam.spec
 
 import glob, os
 import distributed
@@ -15,7 +16,7 @@ import PyQt5
 block_cipher = None
 
 from xicam.gui import static
-datas_src = glob.glob(os.path.join(static.__path__[0],'**/*.*'), recursive=True)
+datas_src = [path for path in glob.glob(os.path.join(static.__path__[0],'**/*.*'), recursive=True) if '__init__.py' not in path]
 datas_dst = [os.path.dirname(os.path.relpath(path,static.__path__[0])) for path in datas_src]
 
 datas_src.append(os.path.join(distributed.__path__[0],'distributed.yaml'))
@@ -41,15 +42,12 @@ pluginmanager.collectPlugins(paths=[xicam.core.__path__[0],xicam.plugins.__path_
 plugins = pluginmanager.getAllPlugins()
 datas_src.extend([plugin.path for plugin in plugins])
 datas_dst.extend(['plugins']*len(plugins))
-markerfiles = glob.glob('../**/*.yapsy-plugin', recursive=True)
+
+markerfiles = list(map(os.path.abspath, glob.glob('**/*.yapsy-plugin', recursive=True)))
 datas_src.extend(markerfiles)
 datas_dst.extend(['plugins']*len(markerfiles))
 
 
-print('datas:')
-for data in zip(datas_dst, datas_src):
-    print(data)
-
 a = Analysis(['run_xicam.py'],
              pathex=['C:\\Users\\rp\\PycharmProjects\\Xi-cam'],
              binaries=[],

appveyor.yml

@@ -1,9 +1,14 @@
 image:
   - Visual Studio 2015
 
+platform:
+  - x64
+
 environment:
   matrix:
-    - PYTHON: "C:\\Python36"
+    - PYTHON: "C:\\Python37-x64"
+      PIP_DEPENDENCIES: "pyqt5"
+      PIP_DEPENDENCIES_FLAGS: "-q"
       MSVC_VERSION: "Visual Studio 10 Win64"
   TWINE_USERNAME: rp
 
@@ -13,6 +18,7 @@ cache:
   - '%LOCALAPPDATA%\pip\Cache\wheels'
 
 install:
+  - "%PYTHON%\\python.exe -m pip install PyQt5"
   - cp "c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include\stdint.h" "C:\Users\appveyor\AppData\Local\Programs\Common\Microsoft\Visual C++ for Python\9.0\VC\include\stdint.h"
   - "%PYTHON%\\python.exe -m pip install --upgrade pip setuptools wheel"
   - "%PYTHON%\\python.exe -m pip install pyinstaller"
@@ -22,17 +28,16 @@ install:
   - git clone http://www.github.com/lbl-camera/Xi-cam.core
   - git clone http://www.github.com/lbl-camera/Xi-cam.plugins
   - git clone http://www.github.com/lbl-camera/Xi-cam.gui
-  - pip install PyQt5
-  - pip install Xi-cam.core/
-  - pip install Xi-cam.plugins/
-  - pip install Xi-cam.gui/
-  - pip install Xi-cam/
-  - pip list
+  - "%PYTHON%\\python.exe -m pip install Xi-cam.core/"
+  - "%PYTHON%\\python.exe -m pip install Xi-cam.plugins/"
+  - "%PYTHON%\\python.exe -m pip install Xi-cam.gui/"
+  - "%PYTHON%\\python.exe -m pip install Xi-cam/"
+  - "%PYTHON%\\python.exe -m pip install list"
 #  - build.bat
-  - pyinstaller Xi-cam/Xi-cam.spec
+  - "%PYTHON%\\Scripts\\pyinstaller.exe Xi-cam/Xi-cam.spec"
 
 
-build: off
+build: false
 
 artifacts:
   - path: dist\*