From aeeba2147b62fd1c5187d03454eda85acc0ce3b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gra=C3=B1a?= Date: Mon, 25 Nov 2013 13:57:28 -0200 Subject: [PATCH] travis-ci updated to pypy 2.2 --- .travis-workarounds.sh | 12 ------------ .travis.yml | 1 - 2 files changed, 13 deletions(-) delete mode 100755 .travis-workarounds.sh diff --git a/.travis-workarounds.sh b/.travis-workarounds.sh deleted file mode 100755 index 3f7727376..000000000 --- a/.travis-workarounds.sh +++ /dev/null @@ -1,12 +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 diff --git a/.travis.yml b/.travis.yml index f2f9c4eb2..3413c5a27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,6 @@ matrix: - env: TOXENV=pypy install: - - ./.travis-workarounds.sh - pip install -M tox script: tox