diff --git a/.travis.yml b/.travis.yml index fad24957361..abb9a586468 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,19 +14,7 @@ env: before_install: - "[ -d ~/.distlib ] && sudo chown -R travis:travis ~/.distlib || true" -install: - - "if [[ $TOXENV == 'pypy' ]]; then sudo add-apt-repository -y ppa:pypy/ppa; fi" - - "if [[ $TOXENV == 'pypy' ]]; then sudo apt-get -y update && sudo apt-get -y install pypy; fi" - # This is required because we need to get rid of the Travis installed PyPy - # or it'll take precedence over the PPA installed one. - - "if [[ $TOXENV == 'pypy' ]]; then sudo rm -rf /usr/local/pypy/bin; fi" - - "if [[ $TOXENV == 'py34' ]]; then .travis/py34.sh; fi" - - sudo apt-get install subversion bzr mercurial - - echo -e "[web]\ncacerts = /etc/ssl/certs/ca-certificates.crt" >> ~/.hgrc - - git config --global user.email "python-virtualenv@googlegroups.com" - - git config --global user.name "Pip" - - pip install --upgrade setuptools - - pip install tox +install: .travis/install.sh script: .travis/run.sh diff --git a/.travis/install.sh b/.travis/install.sh new file mode 100755 index 00000000000..de5fe0c1743 --- /dev/null +++ b/.travis/install.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +set -e +set -x + +case $TOXENV in + py34) + sudo add-apt-repository -y ppa:fkrull/deadsnakes + sudo apt-get update + sudo apt-get install python3.4 + ;; + pypy) + sudo add-apt-repository -y ppa:pypy/ppa + sudo apt-get -y update + sudo apt-get -y install pypy + ;; +esac + +git config --global user.email "python-virtualenv@googlegroups.com" +git config --global user.name "Pip" + +pip install --upgrade setuptools +pip install tox