forked from M-Labs/artiq
conda: switch back to default miniconda python, which is now 3.5.
This commit is contained in:
parent
d560b579f0
commit
5d89acbe82
|
@ -19,23 +19,22 @@ install:
|
|||
- if [ $BUILD_SOC != none ]; then ./.travis/get-xilinx.sh; fi
|
||||
- if [ $BUILD_SOC != none ]; then ./.travis/get-toolchain.sh; fi
|
||||
- . ./.travis/get-anaconda.sh
|
||||
- source $HOME/miniconda/bin/activate py35
|
||||
- conda install -q pip coverage anaconda-client cython
|
||||
- pip install coveralls
|
||||
# workaround for https://github.com/conda/conda-build/issues/466
|
||||
- mkdir -p /home/travis/miniconda/conda-bld/linux-64
|
||||
- conda index /home/travis/miniconda/conda-bld/linux-64
|
||||
script:
|
||||
- conda build --python 3.5 conda/artiq
|
||||
- conda build conda/artiq
|
||||
- conda install -q --use-local artiq
|
||||
- |
|
||||
if [ $BUILD_SOC == none ]; then
|
||||
PACKAGES="$(conda build --output --python 3.5 conda/artiq) $PACKAGES"
|
||||
PACKAGES="$(conda build --output conda/artiq) $PACKAGES"
|
||||
coverage run --source=artiq setup.py test
|
||||
make -C doc/manual html
|
||||
else
|
||||
PACKAGES="$(conda build --output --python 3.5 conda/artiq-$BUILD_SOC) $PACKAGES"
|
||||
conda build --python 3.5 conda/artiq-$BUILD_SOC
|
||||
PACKAGES="$(conda build --output conda/artiq-$BUILD_SOC) $PACKAGES"
|
||||
conda build conda/artiq-$BUILD_SOC
|
||||
fi
|
||||
after_success:
|
||||
- |
|
||||
|
|
|
@ -11,6 +11,5 @@ conda config --set always_yes yes --set changeps1 no
|
|||
conda update -q conda
|
||||
conda info -a
|
||||
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/main
|
||||
conda config --add channels https://conda.anaconda.org/m-labs/channel/dev
|
||||
|
|
Loading…
Reference in New Issue