From e2bf53555e3346072e4e53bb4f6769b044135919 Mon Sep 17 00:00:00 2001
From: Alex Willmer <alex@moreati.org.uk>
Date: Sat, 1 Aug 2015 21:39:25 +0100
Subject: [PATCH 1/2] Travis: Use faster container based build machines

Fortunately the .debs we need are in the whitelist

See
- http://docs.travis-ci.com/user/workers/container-based-infrastructure/
- http://docs.travis-ci.com/user/apt/
---
 .travis.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c355879..d78cba1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,12 @@
 language: python
-sudo: true
+sudo: false
+
+addons:
+  apt:
+    packages:
+      - ldap-utils
+      - slapd
+
 matrix:
   include:
     - python: "2.7"
@@ -8,10 +15,7 @@ matrix:
       env: TOXENV=py33
     - python: "3.4"
       env: TOXENV=py34
-before_install:
-  - sudo apt-get update -qq
 install:
-  - sudo apt-get install -qq ldap-utils slapd
   - pip install tox
 
 script: tox

From f221b492e79451b97ff1c10fd866f0b2a4168202 Mon Sep 17 00:00:00 2001
From: Alex Willmer <alex@moreati.org.uk>
Date: Sat, 1 Aug 2015 21:42:44 +0100
Subject: [PATCH 2/2] Travis: Speedup pip by using favouring wheels

- Upgrade pip to a version that installs from wheels
- Ask Travis to preserve pip's download cache between builds
---
 .travis.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index d78cba1..926c2d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,10 @@
 language: python
 sudo: false
 
+cache:
+  directories:
+    - $HOME/.cache/pip
+
 addons:
   apt:
     packages:
@@ -16,6 +20,7 @@ matrix:
     - python: "3.4"
       env: TOXENV=py34
 install:
+  - pip install "pip>=7.1.0"
   - pip install tox
 
 script: tox