Skip to content

Commit

Permalink
Installing python.app directly to conda env and fixing build artifacts
Browse files Browse the repository at this point in the history
  • Loading branch information
Greg Blumberg committed Jan 22, 2019
1 parent a294104 commit b14ebe9
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,17 @@ steps:
# Must use sudo for python-dependent stuff because conda permissions have
# stupid bug under macOS.
- script: |
sudo conda install -y -q -c conda-forge python.app
sudo conda install -y -q -n test-env -c conda-forge python.app
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
cd runsharp
sudo pyinstaller SHARPpy-osx.spec --noconsole --onefile --log-level DEBUG
cd ..
sudo chmod 777 dist/SHARPpy.app
ls -lh dist
cd ..
displayName: "Installing code and running tests (macOS)"
condition: eq( variables['Agent.OS'], 'Darwin')

Expand All @@ -87,8 +87,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 Expand Up @@ -154,7 +154,7 @@ steps:
# Copy PyInstaller build leftovers the artifacts directory
- task: CopyFiles@2
inputs:
contents: build/**/*
contents: runsharp/build/**/*
targetFolder: $(Build.ArtifactStagingDirectory)
displayName: "Copy PyInstaller build artifacts to staging dir"

Expand Down

0 comments on commit b14ebe9

Please sign in to comment.