From fcb668f4655e0e68378f600d7afd6f0b225644aa Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Sun, 4 Oct 2015 23:03:31 +0800
Subject: [PATCH] travis,conda: python 3.5

---
 .travis.yml             | 4 ++--
 .travis/get-anaconda.sh | 2 +-
 conda/artiq/build.sh    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 216fe090a..525180b64 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: python
 python:
-  - '3.4'
+  - '3.5'
 sudo: false
 env:
   global:
@@ -12,7 +12,7 @@ before_install:
   - if [ $BUILD_SOC -ne 0 ]; then ./.travis/get-xilinx.sh; fi
   - . ./.travis/get-toolchain.sh
   - . ./.travis/get-anaconda.sh
-  - source $HOME/miniconda/bin/activate py34
+  - source $HOME/miniconda/bin/activate py35
   - conda install -q pip coverage anaconda-client migen cython
   - pip install coveralls
 install:
diff --git a/.travis/get-anaconda.sh b/.travis/get-anaconda.sh
index af13fe6e4..790a723ad 100755
--- a/.travis/get-anaconda.sh
+++ b/.travis/get-anaconda.sh
@@ -9,5 +9,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 py34 python=$TRAVIS_PYTHON_VERSION
+conda create -q -n py35 python=$TRAVIS_PYTHON_VERSION
 conda config --add channels https://conda.anaconda.org/m-labs/channel/dev
diff --git a/conda/artiq/build.sh b/conda/artiq/build.sh
index 098b19d4f..959e8a692 100755
--- a/conda/artiq/build.sh
+++ b/conda/artiq/build.sh
@@ -11,7 +11,7 @@ $PYTHON setup.py install --single-version-externally-managed --record=record.txt
 git clone --recursive https://github.com/m-labs/misoc
 export MSCDIR=$SRC_DIR/misoc
 
-ARTIQ_PREFIX=$PREFIX/lib/python3.4/site-packages/artiq
+ARTIQ_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq
 BIN_PREFIX=$ARTIQ_PREFIX/binaries/
 mkdir -p $ARTIQ_PREFIX/misc
 mkdir -p $BIN_PREFIX/kc705 $BIN_PREFIX/pipistrello