From 1df3e76b19de6e369844ef54c2ce9b505544cf80 Mon Sep 17 00:00:00 2001
From: Matt Martz <matt@sivel.net>
Date: Wed, 20 May 2015 14:49:45 -0500
Subject: [PATCH] Switch to travis addons for installing deadsnakes

---
 .travis.yml | 20 +++++++++++---------
 tox.ini     |  4 ++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ddaa43b..e5bd889 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,17 @@ language: python
 python:
  - 2.7
 
+addons:
+  apt:
+    sources:
+      - deadsnakes
+    packages:
+      - python2.4
+      - python2.5
+      - python2.6
+      - python3.1
+      - pypy
+
 env:
  - TOXENV=py24
  - TOXENV=py25
@@ -15,15 +26,6 @@ env:
  - TOXENV=pypy
  - 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:
  - 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;
diff --git a/tox.ini b/tox.ini
index 8d0ebc2..bb37438 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@ skipsdist=true
 [testenv]
 commands =
     {envpython} -V
-    {envpython} speedtest_cli.py
+    {envpython} -m compileall speedtest_cli.py
 
 [testenv:flake8]
 basepython=python
@@ -16,4 +16,4 @@ commands =
 [testenv:pypy]
 commands =
     pypy -V
-    pypy speedtest_cli.py
+    pypy -m compileall speedtest_cli.py