Skip to content

Commit 84818c6

Browse files
authored
fix azure piplines windows env activate call (#723)
* fix env activate on win * more consistent envs
1 parent 15b1cbd commit 84818c6

File tree

5 files changed

+10
-8
lines changed

5 files changed

+10
-8
lines changed

azure-pipelines.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
displayName: Create Anaconda environment
3131
- script: |
3232
source activate test_env
33-
pip install pytest pytest-azurepipelines
33+
pip install pytest-azurepipelines
3434
pip install -e .
3535
displayName: 'pip dependencies'
3636
- script: |
@@ -83,16 +83,16 @@ jobs:
8383
- script: conda env create --quiet --file ci/requirements-py$(python.version).yml
8484
displayName: Create Anaconda environment
8585
- script: |
86-
call activate myEnvironment
87-
pip install pytest pytest-azurepipelines pytest-mock
86+
call activate test_env
87+
pip install pytest-azurepipelines
8888
pip install -e .
8989
displayName: 'pip dependencies'
9090
- script: |
91-
call activate myEnvironment
91+
call activate test_env
9292
conda list
9393
displayName: 'List installed dependencies'
9494
- script: |
95-
call activate myEnvironment
95+
call activate test_env
9696
pytest pvlib --junitxml=junit/test-results.xml
9797
displayName: 'pytest'
9898
- task: PublishTestResults@2

ci/requirements-py27.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: test_env
22
channels:
3-
- conda-forge
43
- defaults
4+
- conda-forge
55
dependencies:
66
- python=2.7
77
- numpy

ci/requirements-py35.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: test_env
22
channels:
3-
- conda-forge
43
- defaults
4+
- conda-forge
55
dependencies:
66
- python=3.5
77
- numpy

ci/requirements-py36.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ dependencies:
1919
- pip:
2020
- coveralls
2121
- pytest-mock
22+
- pytest-timeout
2223
- pvfactors==0.1.5

ci/requirements-py37.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@ dependencies:
1111
- pytz
1212
- ephem
1313
- numba
14-
# - siphon
14+
- siphon
1515
- pytest
1616
- pytest-cov
1717
- nose
1818
- shapely # pvfactors dependency
1919
- pip:
2020
- coveralls
2121
- pytest-mock
22+
- pytest-timeout
2223
- pvfactors==0.1.5

0 commit comments

Comments
 (0)