diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-01-02 10:56:08 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-01-02 10:56:08 -0800 |
| commit | 267dbc946b4584b7b4ed10a439b2820d3b048356 (patch) | |
| tree | 45fea345889584b74496359496ba202cf4c60802 /.travis | |
| parent | 71e8ca0d79d8599f1f00d6ec18cb19a2ffabfc8d (diff) | |
| parent | a6d5d6ec53da5bea0193047c5e535a05442f2dfd (diff) | |
| download | cryptography-267dbc946b4584b7b4ed10a439b2820d3b048356.tar.gz cryptography-267dbc946b4584b7b4ed10a439b2820d3b048356.tar.bz2 cryptography-267dbc946b4584b7b4ed10a439b2820d3b048356.zip | |
Merge branch 'master' into validate-iv
Conflicts:
cryptography/hazmat/primitives/ciphers/modes.py
Diffstat (limited to '.travis')
| -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 |