diff options
| author | David Reid <dreid@dreid.org> | 2013-11-20 13:33:50 -0800 |
|---|---|---|
| committer | David Reid <dreid@dreid.org> | 2013-11-20 13:33:50 -0800 |
| commit | 838ad7d2f5bb97242a9f75ac9055be5be75a7711 (patch) | |
| tree | 2f33d95187f08e71fba1fa87e0d5834d9127edc1 | |
| parent | eb7f2a37fee0fdeb70f650b46f580b2eab6d0c05 (diff) | |
| parent | 5a4aa42542c952905fbf83582bff4bb2b328c4e1 (diff) | |
| download | cryptography-838ad7d2f5bb97242a9f75ac9055be5be75a7711.tar.gz cryptography-838ad7d2f5bb97242a9f75ac9055be5be75a7711.tar.bz2 cryptography-838ad7d2f5bb97242a9f75ac9055be5be75a7711.zip | |
Merge pull request #273 from alex/pypy-is-now-up-to-date
Travis now has an up to date pypy
| -rwxr-xr-x | .travis/install.sh | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/.travis/install.sh b/.travis/install.sh index fdd71907..4aa39799 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -5,24 +5,8 @@ set -x if [[ "${OPENSSL}" == "0.9.8" ]]; then sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu/ lucid main" -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 -y update 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 |