diff options
| author | David Reid <dreid@dreid.org> | 2014-01-02 10:01:44 -0800 |
|---|---|---|
| committer | David Reid <dreid@dreid.org> | 2014-01-02 10:01:44 -0800 |
| commit | a5982a5db4ff22feeec0a977853b63d4976872f7 (patch) | |
| tree | c189e7b7db2013adfd1174e2d94b90f9c17be45f | |
| parent | 995de066184eeeadbc260186955e23cc1d4bf6ab (diff) | |
| download | cryptography-a5982a5db4ff22feeec0a977853b63d4976872f7.tar.gz cryptography-a5982a5db4ff22feeec0a977853b63d4976872f7.tar.bz2 cryptography-a5982a5db4ff22feeec0a977853b63d4976872f7.zip | |
Revert "Travis now has an up to date pypy"
This reverts commit 5a4aa42542c952905fbf83582bff4bb2b328c4e1.
| -rwxr-xr-x | .travis/install.sh | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/.travis/install.sh b/.travis/install.sh index 4aa39799..fdd71907 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -5,8 +5,24 @@ set -x if [[ "${OPENSSL}" == "0.9.8" ]]; then sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu/ lucid main" - sudo apt-get -y update +fi + +if [[ "${TOX_ENV}" == "pypy" ]]; then + sudo add-apt-repository -y ppa:pypy/ppa +fi + +sudo apt-get -y update + +if [[ "${OPENSSL}" == "0.9.8" ]]; then sudo apt-get install -y --force-yes libssl-dev/lucid fi +if [[ "${TOX_ENV}" == "pypy" ]]; then + sudo apt-get install -y pypy + + # 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 + pip install tox coveralls |