Testing build on azure pipelines again

sharppy · Feb 12, 2019 · 43fc017 · 43fc017
1 parent c8a80f2
commit 43fc017
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -53,8 +53,8 @@ steps:
     sleep 3 # give xvfb some time to start
     xdpyinfo | grep dimensions # Check display dimensions
     python ci/screen.py # Check display dimensions as seen by PySide
-    pytest -v --junitxml=junit/test-results.xml
-    mv examples/data/14061619.png examples/data/14061619_linux.png
+    #pytest -v --junitxml=junit/test-results.xml
+    #mv examples/data/14061619.png examples/data/14061619_linux.png
   displayName: "Installing code and running tests (Linux)"
   condition: eq( variables['Agent.OS'], 'Linux')
 
@@ -70,8 +70,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
     cd runsharp
     sudo pyinstaller SHARPpy-osx.spec --noconsole --onefile --log-level DEBUG
     sudo chmod 777 dist/SHARPpy.app
@@ -92,8 +92,8 @@ steps:
     python ci/screen.py
     python setup.py -q install --user
     #pip install -e . 
-    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
     cd runsharp
     pyinstaller SHARPpy-win7-64.spec --log-level DEBUG
     cd ..

diff --git a/runsharp/SHARPpy-osx.spec b/runsharp/SHARPpy-osx.spec
@@ -7,6 +7,7 @@ import glob
 import sharppy
 from sharppy._version import get_versions
 
+print("PATH TO SHARPPY:", sharppy.__file__)
 # Write the versions file using versioneer, because PyInstaller doesn't do this automatically
 ver = get_versions()
 ver = str(ver)
@@ -16,6 +17,9 @@ ver_file.write('def get_versions():\n')
 ver_file.write('    return ' + ver)
 ver_file.close()
 
+def sharppy
+import sharppy
+
 # Analyze the SHARPpy package to get dependencies, etc.
 a = Analysis(['SHARPpy.py'],
              pathex=['/Users/blumberg/SHARPpy/runsharp'],

diff --git a/runsharp/SHARPpy-win7-64.spec b/runsharp/SHARPpy-win7-64.spec
@@ -6,6 +6,7 @@ import glob
 import sharppy
 from sharppy._version import get_versions
 
+print("PATH TO SHARPPY:", sharppy.__file__)
 # Write the versions file using versioneer, because PyInstaller doesn't do this automatically
 ver = get_versions()
 ver = str(ver)
@@ -15,6 +16,8 @@ ver_file.write("def get_versions():\n")
 ver_file.write('    return ' + ver)
 ver_file.close()
 
+def sharppy
+import sharppy
 
 a = Analysis(['SHARPpy.py'],
              pathex=[r'C:\Users\Tim\SHARPpy\runsharp'],