more travis fixing attempts

m-labs · Oct 4, 2015 · 342e72b · 342e72b
1 parent 322cf54
commit 342e72b
Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -1,14 +1,13 @@
-#!/bin/bash
+#!/bin/sh
 # Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
 
 export PATH=$HOME/miniconda/bin:$PATH
 wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
 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