From 5ae94ae42d656445b97e72ba859aae35cb9c4921 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Gra=C3=B1a?= <dangra@gmail.com>
Date: Fri, 31 Jul 2015 16:33:37 -0300
Subject: [PATCH 1/3] Use new travis-ci container based builds

---
 .travis-workarounds.sh | 15 ---------------
 .travis.yml            |  2 +-
 2 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100755 .travis-workarounds.sh

diff --git a/.travis-workarounds.sh b/.travis-workarounds.sh
deleted file mode 100755
index 5c34e54f7..000000000
--- a/.travis-workarounds.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-set -e
-set -x
-
-if [[ "${TOXENV}" == "pypy" ]]; then
-    sudo add-apt-repository -y ppa:pypy/ppa
-    sudo apt-get -qy update
-    sudo apt-get install -y pypy pypy-dev
-    # This is required because we need to get rid of the Travis installed PyPy
-    # or it'll take precedence over the PPA installed one.
-    sudo rm -rf /usr/local/pypy/bin
-fi
-
-# Workaround travis-ci/travis-ci#2065
-pip install -U wheel
diff --git a/.travis.yml b/.travis.yml
index 4a0ef834c..419f52c96 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,12 @@
 language: python
 python: 2.7
+sudo: false
 env:
 - TOXENV=py27
 - TOXENV=precise
 - TOXENV=py33
 - TOXENV=docs
 install:
-- "./.travis-workarounds.sh"
 - pip install -U tox
 script: tox
 notifications:

From 5d4cdb59a90cd2c36636f323713e28ed35579feb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Gra=C3=B1a?= <dangra@gmail.com>
Date: Fri, 31 Jul 2015 16:39:12 -0300
Subject: [PATCH 2/3] cache pip cache

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

diff --git a/.travis.yml b/.travis.yml
index 419f52c96..18ef5a57f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,9 @@ notifications:
     skip_join: true
     channels:
     - irc.freenode.org#scrapy
+cache:
+  directories:
+    - $HOME/.cache/pip
 deploy:
   provider: pypi
   distributions: "sdist bdist_wheel"

From 49fd77d693bfe17c162480d7fc86f5bed946f2c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Gra=C3=B1a?= <dangra@gmail.com>
Date: Fri, 31 Jul 2015 16:45:43 -0300
Subject: [PATCH 3/3] indent travis yaml

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

diff --git a/.travis.yml b/.travis.yml
index 18ef5a57f..d0758fdaf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,12 +2,12 @@ language: python
 python: 2.7
 sudo: false
 env:
-- TOXENV=py27
-- TOXENV=precise
-- TOXENV=py33
-- TOXENV=docs
+ - TOXENV=py27
+ - TOXENV=precise
+ - TOXENV=py33
+ - TOXENV=docs
 install:
-- pip install -U tox
+ - pip install -U tox
 script: tox
 notifications:
   irc: