diff --git a/.travis.yml b/.travis.yml index 2a7cad5b58..51d44bf3d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,17 +2,10 @@ language: python python: - "2.6" - "2.7" + - "3.2" + - "3.3" -install: - - sudo sh -c "wget -qO- https://get.docker.io/gpg | apt-key add -" - - sudo sh -c "echo deb http://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list" - - sudo apt-get update - - echo exit 101 | sudo tee /usr/sbin/policy-rc.d - - sudo chmod +x /usr/sbin/policy-rc.d - - sudo apt-get install -qy slirp lxc lxc-docker=0.7.3 - - git clone git://github.com/jpetazzo/sekexe - - python setup.py install - - pip install -r requirements-dev.txt +install: script/travis-install script: - pwd diff --git a/script/travis-install b/script/travis-install new file mode 100644 index 0000000000..e68423dafa --- /dev/null +++ b/script/travis-install @@ -0,0 +1,16 @@ +#!/bin/bash + +sudo sh -c "wget -qO- https://get.docker.io/gpg | apt-key add -" +sudo sh -c "echo deb http://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list" +sudo apt-get update +echo exit 101 | sudo tee /usr/sbin/policy-rc.d +sudo chmod +x /usr/sbin/policy-rc.d +sudo apt-get install -qy slirp lxc lxc-docker=0.7.3 +git clone git://github.com/jpetazzo/sekexe +python setup.py install +pip install -r requirements-dev.txt + +if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then + pip install unittest2 +fi +