Skip to content

Commit

Permalink
Azure should use custom environment.yml for Windows build
Browse files Browse the repository at this point in the history
  • Loading branch information
Greg Blumberg committed Sep 21, 2019
1 parent ecdfc4b commit 693f1d7
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 2 deletions.
7 changes: 6 additions & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,12 @@ steps:
# createCustomEnvironment: true

- script: conda env create --quiet --file environment.yml
displayName: Create Anaconda environment
displayName: Create Anaconda environment (*nix)
condition: or( eq( variables['Agent.OS'], 'Darwin' ), eq( variables['Agent.OS'], 'Linux' ))

- script: conda env create --quiet --file env-win-binary.yml
displayName: Create Anaconda environment (Windows)
condition: eq( variables['Agent.OS'], 'Windows_NT')

# Output the conda environment packages and which python and pip is being used (for diagnostic purposes)
- script: which python & which pip & which pyinstaller & conda list
Expand Down
24 changes: 24 additions & 0 deletions ci/env-win-binary.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: devel
channels:
- conda-forge
- conda-forge/label/testing
- anaconda
dependencies:
- python=3
- numpy=1.15.*
- sphinx
- pytest
- qtpy
- sphinx_rtd_theme
#- sphinx-gallery
#Sphinx-Gallery removed because it requires matplotlib/pyqt and conflicts with pyside2's Qt version
- requests
- python-dateutil
- pyinstaller
- setuptools
- certifi
- pip
- pip:
- sphinx-prompt
- pydocstyle
- PySide2
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ channels:
dependencies:
- python=3
- numpy=1.15.*
- pyside2=5.12.*
#- pyside2=5.12.*
- sphinx
- pytest
- qtpy
Expand Down

0 comments on commit 693f1d7

Please sign in to comment.