summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Taylor <jtaylor.debian@googlemail.com>2014-02-24 20:19:50 +0100
committerJulian Taylor <jtaylor.debian@googlemail.com>2014-02-25 19:09:22 +0100
commit2872bf7a7433697483eba0030c67ae27c8f7914e (patch)
tree24f445b38cc77873f17d270dc09a830c2589157c
parentb5c62f81a2dd8af8f8d507eb990d5f4efc77ee5f (diff)
downloadnumpy-2872bf7a7433697483eba0030c67ae27c8f7914e.tar.gz
TST: switch i386 build to python3.4 defaulting ubuntu 14.04
to do that fix a missing $DIST variable usage in the test script
-rw-r--r--.travis.yml2
-rwxr-xr-xtools/travis-test.sh6
2 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 5bd29af0c..6d87767f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ python:
matrix:
include:
- python: 3.3
- env: USE_CHROOT=1 ARCH=i386 DIST=saucy
+ env: USE_CHROOT=1 ARCH=i386 DIST=trusty PYTHON=3.4
- python: 3.2
env: USE_DEBUG=1
- python: 2.7
diff --git a/tools/travis-test.sh b/tools/travis-test.sh
index 2e2415387..4783428c1 100755
--- a/tools/travis-test.sh
+++ b/tools/travis-test.sh
@@ -43,9 +43,9 @@ setup_chroot()
sudo debootstrap --variant=buildd --include=fakeroot,build-essential --arch=$ARCH --foreign $DIST $DIR
sudo chroot $DIR ./debootstrap/debootstrap --second-stage
sudo rsync -a $TRAVIS_BUILD_DIR $DIR/
- echo deb http://archive.ubuntu.com/ubuntu/ saucy main restricted universe multiverse | sudo tee -a $DIR/etc/apt/sources.list
- echo deb http://archive.ubuntu.com/ubuntu/ saucy-updates main restricted universe multiverse | sudo tee -a $DIR/etc/apt/sources.list
- echo deb http://security.ubuntu.com/ubuntu saucy-security main restricted universe multiverse | sudo tee -a $DIR/etc/apt/sources.list
+ echo deb http://archive.ubuntu.com/ubuntu/ $DIST main restricted universe multiverse | sudo tee -a $DIR/etc/apt/sources.list
+ echo deb http://archive.ubuntu.com/ubuntu/ $DIST-updates main restricted universe multiverse | sudo tee -a $DIR/etc/apt/sources.list
+ echo deb http://security.ubuntu.com/ubuntu $DIST-security main restricted universe multiverse | sudo tee -a $DIR/etc/apt/sources.list
sudo chroot $DIR bash -c "apt-get update"
sudo chroot $DIR bash -c "apt-get install -qq -y --force-yes eatmydata"
echo /usr/lib/libeatmydata/libeatmydata.so | sudo tee -a $DIR/etc/ld.so.preload