From 6e42f0bf447ebb4a6debabf432d83310ef47441d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Gra=C3=B1a?= <dangra@gmail.com>
Date: Wed, 30 Dec 2015 15:20:04 -0300
Subject: [PATCH] Run on new travis-ci infra

---
 .travis-workarounds.sh | 15 ---------------
 .travis.yml            |  5 ++++-
 2 files changed, 4 insertions(+), 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 32a42f2c4..9a60b6015 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
 language: python
 python: 2.7
+sudo: false
 branches:
   only:
     - master
@@ -10,7 +11,6 @@ env:
 - TOXENV=py33
 - TOXENV=docs
 install:
-- "./.travis-workarounds.sh"
 - pip install -U tox twine wheel
 script: tox
 notifications:
@@ -19,6 +19,9 @@ notifications:
     skip_join: true
     channels:
     - irc.freenode.org#scrapy
+cache:
+  directories:
+    - $HOME/.cache/pip
 deploy:
   provider: pypi
   distributions: "sdist bdist_wheel"