Skip to content

Commit

Permalink
Testing deployment - changing path in .spec
Browse files Browse the repository at this point in the history
  • Loading branch information
Greg Blumberg committed Jan 22, 2019
1 parent 62a7a7c commit c8a80f2
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 14 deletions.
15 changes: 3 additions & 12 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,10 @@ steps:

# Setup the conda environment and install the needed packages (use conda-forge)
- task: CondaEnvironment@1
displayName: 'Install Conda and packages (OS X)'
inputs:
packageSpecs: 'python=3 numpy=1.15.* pyside pytest pip python-dateutil requests setuptools pyinstaller python.app'
installOptions: '-q -c conda-forge'
condition: eq( variables['Agent.OS'], 'Darwin')

- task: CondaEnvironment@1
displayName: 'Install Conda and packages (Linux, Windows)'
displayName: 'Install Conda and packages'
inputs:
packageSpecs: 'python=3 numpy=1.15.* pyside pytest pip python-dateutil requests setuptools pyinstaller'
installOptions: '-q -c conda-forge'
condition: ne( variables['Agent.OS'], 'Darwin')

# environmentName: 'test-env'
# createCustomEnvironment: true

Expand Down Expand Up @@ -99,8 +90,8 @@ steps:
# Install and test scripts for Windows
- script: |
python ci/screen.py
#python setup.py -q install --user
pip install -e .
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
cd runsharp
Expand Down
2 changes: 1 addition & 1 deletion runsharp/SHARPpy-osx.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- mode: python -*-
# Compile using `pyinstaller SHARPpy-osx.spec --onefile --noconsole`
import sys
sys.path.append('./')
sys.path.append('../')

import glob
import sharppy
Expand Down
2 changes: 1 addition & 1 deletion runsharp/SHARPpy-win7-64.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- mode: python -*-
import sys
sys.path.append('./')
sys.path.append('../')

import glob
import sharppy
Expand Down

0 comments on commit c8a80f2

Please sign in to comment.