From 342e72bed66ee3ea4183ee24b7f8923496b0b6aa Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Mon, 5 Oct 2015 00:09:36 +0800 Subject: [PATCH] more travis fixing attempts --- .travis.yml | 2 +- .travis/get-anaconda.sh | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 525180b64..2271bbd2e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ before_install: - conda install -q pip coverage anaconda-client migen cython - pip install coveralls install: - - conda build conda/artiq + - conda build --python 3.5 conda/artiq - conda install -q artiq --use-local script: - coverage run --source=artiq setup.py test diff --git a/.travis/get-anaconda.sh b/.travis/get-anaconda.sh index 7290395a6..790a723ad 100755 --- a/.travis/get-anaconda.sh +++ b/.travis/get-anaconda.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Copyright (C) 2014, 2015 Robert Jordens 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 hash -r 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 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/dev