more travis fixing attempts

This commit is contained in:
Sebastien Bourdeauducq 2015-10-05 00:09:36 +08:00
parent 322cf54aeb
commit 342e72bed6
2 changed files with 3 additions and 4 deletions

View File

@ -16,7 +16,7 @@ before_install:
- conda install -q pip coverage anaconda-client migen cython - conda install -q pip coverage anaconda-client migen cython
- pip install coveralls - pip install coveralls
install: install:
- conda build conda/artiq - conda build --python 3.5 conda/artiq
- conda install -q artiq --use-local - conda install -q artiq --use-local
script: script:
- coverage run --source=artiq setup.py test - coverage run --source=artiq setup.py test

View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh
# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com> # Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
export PATH=$HOME/miniconda/bin:$PATH export PATH=$HOME/miniconda/bin:$PATH
@ -6,9 +6,8 @@ wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O min
bash miniconda.sh -b -p $HOME/miniconda bash miniconda.sh -b -p $HOME/miniconda
hash -r hash -r
conda config --set always_yes yes --set changeps1 no conda config --set always_yes yes --set changeps1 no
conda create -q -n py35 python=$TRAVIS_PYTHON_VERSION
source $HOME/miniconda/bin/activate py35
conda update -q conda conda update -q conda
conda info -a conda info -a
conda install conda-build jinja2 conda install conda-build jinja2
conda create -q -n py35 python=$TRAVIS_PYTHON_VERSION
conda config --add channels https://conda.anaconda.org/m-labs/channel/dev conda config --add channels https://conda.anaconda.org/m-labs/channel/dev