diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-06-06 22:18:22 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-06-07 23:27:54 -0500 |
| commit | 81f327688811bd911731dd7a629dd132b02ac04d (patch) | |
| tree | 3d1d4dd1264faaed0b614bb49decaceeb48b8137 | |
| parent | 74b0ea5b668370e11e6191a1f85c826044d6d5e7 (diff) | |
| download | cryptography-81f327688811bd911731dd7a629dd132b02ac04d.tar.gz cryptography-81f327688811bd911731dd7a629dd132b02ac04d.tar.bz2 cryptography-81f327688811bd911731dd7a629dd132b02ac04d.zip | |
install pypy 2.6.0 in container infra
| -rwxr-xr-x | .travis/install.sh | 9 | ||||
| -rwxr-xr-x | .travis/run.sh | 7 |
2 files changed, 16 insertions, 0 deletions
diff --git a/.travis/install.sh b/.travis/install.sh index 9db27437..a046a5d8 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -51,6 +51,15 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then pyenv rehash python -m pip install --user virtualenv else + # temporary pyenv installation to get pypy-2.6 before container infra upgrade + if [[ "${TOXENV}" == "pypy" ]]; then + git clone https://github.com/yyuu/pyenv.git ~/.pyenv + PYENV_ROOT="$HOME/.pyenv" + PATH="$PYENV_ROOT/bin:$PATH" + eval "$(pyenv init -)" + pyenv install pypy-2.6.0 + pyenv global pypy-2.6.0 + fi pip install virtualenv fi diff --git a/.travis/run.sh b/.travis/run.sh index 1efbd60b..17358655 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -16,6 +16,13 @@ if [[ "$(uname -s)" == "Darwin" ]]; then # CommonCrypto when we test against brew OpenSSL export TOX_FLAGS="--backend=openssl" fi +else + if [[ "${TOXENV}" == "pypy" ]]; then + PYENV_ROOT="$HOME/.pyenv" + PATH="$PYENV_ROOT/bin:$PATH" + eval "$(pyenv init -)" + pyenv global pypy-2.6.0 + fi fi source ~/.venv/bin/activate tox -- $TOX_FLAGS |