diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-01-04 20:55:23 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-01-04 20:55:23 -0800 |
| commit | 008b7a5f650466d106e27ed2e92b76e0d6346952 (patch) | |
| tree | 85f37d54e0697434b5bd1c9d4af31c2ffa76c561 | |
| parent | 86b7a8efdc3a7a95a472b00157e4372abd1c064b (diff) | |
| download | cryptography-008b7a5f650466d106e27ed2e92b76e0d6346952.tar.gz cryptography-008b7a5f650466d106e27ed2e92b76e0d6346952.tar.bz2 cryptography-008b7a5f650466d106e27ed2e92b76e0d6346952.zip | |
Revert "Revert "Travis now has an up to date pypy""
This reverts commit a5982a5db4ff22feeec0a977853b63d4976872f7.
| -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 |