Switch to travis addons for installing deadsnakes

This commit is contained in:
Matt Martz 2015-05-20 14:49:45 -05:00
parent 1e44e9e2f1
commit 1df3e76b19
2 changed files with 13 additions and 11 deletions

View File

@ -3,6 +3,17 @@ language: python
python: python:
- 2.7 - 2.7
addons:
apt:
sources:
- deadsnakes
packages:
- python2.4
- python2.5
- python2.6
- python3.1
- pypy
env: env:
- TOXENV=py24 - TOXENV=py24
- TOXENV=py25 - TOXENV=py25
@ -15,15 +26,6 @@ env:
- TOXENV=pypy - TOXENV=pypy
- TOXENV=flake8 - TOXENV=flake8
before_install:
- if [[ $(echo "$TOXENV" | egrep -c "(py2[45]|py3[14])") != 0 ]]; then sudo add-apt-repository -y ppa:fkrull/deadsnakes; fi;
- if [[ $(echo "$TOXENV" | egrep -c "(py2[45]|py3[14])") != 0 ]]; then sudo apt-get update -qq; fi;
- if [[ "$TOXENV" == "py24" ]]; then sudo apt-get install -y python2.4; fi;
- if [[ "$TOXENV" == "py25" ]]; then sudo apt-get install -y python2.5; fi;
- if [[ "$TOXENV" == "py31" ]]; then sudo apt-get install -y python3.1; fi;
- if [[ "$TOXENV" == "py34" ]]; then sudo apt-get install -y python3.4; fi;
- if [[ "$TOXENV" == "pypy" ]]; then sudo apt-get install -y pypy; fi;
install: install:
- if [[ $(echo "$TOXENV" | egrep -c "(py2[45]|py31)") != 0 ]]; then pip install virtualenv==1.7.2 tox==1.3; fi; - if [[ $(echo "$TOXENV" | egrep -c "(py2[45]|py31)") != 0 ]]; then pip install virtualenv==1.7.2 tox==1.3; fi;
- if [[ $(echo "$TOXENV" | egrep -c "(py2[45]|py31)") == 0 ]]; then pip install tox; fi; - if [[ $(echo "$TOXENV" | egrep -c "(py2[45]|py31)") == 0 ]]; then pip install tox; fi;

View File

@ -4,7 +4,7 @@ skipsdist=true
[testenv] [testenv]
commands = commands =
{envpython} -V {envpython} -V
{envpython} speedtest_cli.py {envpython} -m compileall speedtest_cli.py
[testenv:flake8] [testenv:flake8]
basepython=python basepython=python
@ -16,4 +16,4 @@ commands =
[testenv:pypy] [testenv:pypy]
commands = commands =
pypy -V pypy -V
pypy speedtest_cli.py pypy -m compileall speedtest_cli.py