Modified some scripts - trying to get PyInstaller to see Pyside, etc.

sharppy · Jan 18, 2019 · dd15cc5 · dd15cc5
1 parent 2a78bd4
commit dd15cc5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -66,8 +66,8 @@ steps:
     system_profiler SPDisplaysDataType | grep Resolution # Check display dimensions using OS tools
     sudo python ci/screen.py # Check display dimensions as seen by PySide
     sudo python setup.py -q install
-    #sudo pytest -v --junitxml=junit/test-results.xml
-    #sudo mv examples/data/14061619.png examples/data/14061619_mac.png
+    sudo pytest -v --junitxml=junit/test-results.xml
+    sudo mv examples/data/14061619.png examples/data/14061619_mac.png
     sudo python -m PyInstaller runsharp/SHARPpy-osx.spec --noconsole --onefile --log-level DEBUG
     sudo chmod 777 dist/SHARPpy.app
     ls -lh dist
@@ -86,8 +86,8 @@ steps:
     python ci/screen.py
     python setup.py -q install --user
     
-    #pytest -v --junitxml=junit/test-results.xml
-    #move examples\\data\\14061619.png examples\\data\\14061619_win.png
+    pytest -v --junitxml=junit/test-results.xml
+    move examples\\data\\14061619.png examples\\data\\14061619_win.png
     python -m PyInstaller runsharp/SHARPpy-win7-64.spec --log-level DEBUG
   displayName: "Installing code and running tests (Windows)"
   condition: eq( variables['Agent.OS'], 'Windows_NT')

diff --git a/runsharp/SHARPpy-linux-redhat5.spec b/runsharp/SHARPpy-linux-redhat5.spec
@@ -37,6 +37,7 @@ datasources = glob.glob("../datasources/*.csv") + glob.glob("../datasources/*.xm
 
 for hail in sars_hail:
     a.datas += [("sharppy/databases/sars/hail/" + hail.split("/")[-1], hail, "DATA")]
+
 for supr in sars_supr:
     a.datas += [("sharppy/databases/sars/supercell/" + supr.split("/")[-1], supr, "DATA")]
 
@@ -59,11 +60,6 @@ exe = EXE(pyz,
           upx=True,
           console=False )
 
-
-# Revert the _version.py file to its original version using git
-import subprocess
-subprocess.Popen(['git', 'checkout', '--', ver_fname])
-
 # Revert the _version.py file to its original version using git
 import subprocess
 subprocess.Popen(['git', 'checkout', '--', ver_fname])

diff --git a/runsharp/SHARPpy-osx.spec b/runsharp/SHARPpy-osx.spec
@@ -1,5 +1,7 @@
 # -*- mode: python -*-
 # Compile using `pyinstaller SHARPpy-osx.spec --onefile --noconsole`
+import sys
+sys.path.append('./')
 
 import glob
 import sharppy

diff --git a/runsharp/SHARPpy-win7-64.spec b/runsharp/SHARPpy-win7-64.spec
@@ -1,4 +1,7 @@
 # -*- mode: python -*-
+#import sys
+sys.path.append('./')
+
 import glob
 import sharppy
 from sharppy._version import get_versions