Skip to content

Commit d0528fd

Browse files
authored
Merge pull request #102 from roryyorke/rory-conda-build-tweaks
BuildFix: change Travis build to handle conda changes
2 parents 7b07af3 + a873368 commit d0528fd

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

.travis.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,24 @@ before_install:
2828
- hash -r
2929
- conda config --set always_yes yes --set changeps1 no
3030
- conda update -q conda
31-
- conda install --yes python=$TRAVIS_PYTHON_VERSION conda-build pip coverage
31+
# conda-build must be installed in the conda root environment
32+
- conda install conda-build
33+
# TODO: point at conda.anaconda.org?
3234
- conda config --add channels http://conda.binstar.org/cwrowley
3335
- conda info -a
36+
- conda create -q -n test-environment python="$TRAVIS_PYTHON_VERSION" pip coverage slycot
37+
- source activate test-environment
38+
# coveralls not in conda repos
39+
- pip install coveralls
3440

3541
# Install packages
3642
install:
37-
- conda install slycot
38-
- conda build conda-recipe
43+
- conda build --python "$TRAVIS_PYTHON_VERSION" conda-recipe
3944
- conda install control --use-local
40-
- pip install coveralls
4145

4246
# command to run tests
4347
script:
4448
- coverage run setup.py test
49+
4550
after_success:
4651
- coveralls

0 commit comments

Comments
 (0)