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..d0758fdaf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,13 @@ 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: -- "./.travis-workarounds.sh" -- pip install -U tox + - pip install -U tox script: tox notifications: irc: @@ -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"