From e4898b463c8877523b8f3344d9e73480ffd872e1 Mon Sep 17 00:00:00 2001 From: Carwyn Pelley Date: Fri, 17 Jan 2014 09:54:06 +0000 Subject: [PATCH 1/2] BLD: Scipy travis update to 0.12.0 --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e7a21181c3..c4687c5f00 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,9 @@ install: # add repo - ./.travis_no_output sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3E5C1192 - - yes | ./.travis_no_output sudo add-apt-repository ppa:ubuntugis/ppa + - ./.travis_no_output sudo add-apt-repository -y ppa:ubuntugis/ppa +# access to scipy 0.12.0 https://launchpad.net/~pylab/+archive/stable + - sudo add-apt-repository -y 'deb http://ppa.launchpad.net/pylab/stable/ubuntu precise main' - ./.travis_no_output sudo apt-get update # install deps From 6739695815d051c36427223f1132052c78c51d93 Mon Sep 17 00:00:00 2001 From: Carwyn Pelley Date: Wed, 22 Jan 2014 12:36:43 +0000 Subject: [PATCH 2/2] Add ppa syntax change --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c4687c5f00..b155449fc2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ install: - ./.travis_no_output sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3E5C1192 - ./.travis_no_output sudo add-apt-repository -y ppa:ubuntugis/ppa # access to scipy 0.12.0 https://launchpad.net/~pylab/+archive/stable - - sudo add-apt-repository -y 'deb http://ppa.launchpad.net/pylab/stable/ubuntu precise main' + - sudo add-apt-repository -y ppa:pylab/stable - ./.travis_no_output sudo apt-get update # install deps