From edfa79fc5c43a8f30c60d694f73780394d8c8e1c Mon Sep 17 00:00:00 2001
From: evilaliv3 <giovanni.pellerano@evilaliv3.org>
Date: Sun, 27 Dec 2015 12:50:30 +0100
Subject: [PATCH 1/2] Set python version in the travis matrix

---
 .travis.yml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8dde06ceb..9863e1d81 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,11 +17,16 @@ env:
   global:
     - GOPATH=/tmp/go
     - PATH=$GOPATH/bin:$PATH
-  matrix:
-    - TOXENV=py26 BOULDER_INTEGRATION=1
-    - TOXENV=py27 BOULDER_INTEGRATION=1
-    - TOXENV=lint
-    - TOXENV=cover
+matrix:
+  include:
+    - python: "2.6"
+      env: TOXENV=py26 BOULDER_INTEGRATION=1
+    - python: "2.7"
+      env: TOXENV=py27 BOULDER_INTEGRATION=1
+    - python: "2.7"
+      env: TOXENV=lint
+    - python: "2.7"
+      env: TOXENV=cover
 
 
 # Only build pushes to the master branch, PRs, and branches beginning with
@@ -44,7 +49,6 @@ addons:
     sources:
     - augeas
     packages:  # keep in sync with bootstrap/ubuntu.sh and Boulder
-    - python
     - python-dev
     - python-virtualenv
     - gcc

From 9e00cd5c2c45b622e4f2b1d7848735e6e9a72be0 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Tue, 19 Jan 2016 15:47:50 -0800
Subject: [PATCH 2/2] Retry enabling pip cache

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 7f6a2f87c..67da27d00 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,9 @@
 language: python
 
+cache:
+    directories:
+        - $HOME/.cache/pip
+
 services:
   - rabbitmq
   - mariadb