diff options
author | Donald Stufft <donald@stufft.io> | 2015-06-11 09:35:03 -0400 |
---|---|---|
committer | Donald Stufft <donald@stufft.io> | 2015-06-11 09:35:03 -0400 |
commit | 15cc4edec22c455f467fa97bb27aa6bbb9deffb4 (patch) | |
tree | b113c6a1b45246c430123c9c57a0a10319b88540 | |
parent | 51ebadb34d22d25c10c5e54d4dada46b88c3829b (diff) | |
download | py-bcrypt-git-15cc4edec22c455f467fa97bb27aa6bbb9deffb4.tar.gz |
Install PyPy 2.6 on Travis
-rw-r--r-- | .travis.yml | 4 | ||||
-rwxr-xr-x | .travis/install.sh | 15 | ||||
-rwxr-xr-x | .travis/run.sh | 13 |
3 files changed, 30 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 563d841..07596c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,9 +20,9 @@ env: - TOXENV=pep8 - TOXENV=py3pep8 -install: pip install tox +install: .travis/install.sh -script: tox +script: .travis/run.sh branches: only: diff --git a/.travis/install.sh b/.travis/install.sh new file mode 100755 index 0000000..c37edaa --- /dev/null +++ b/.travis/install.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +set -e +set -x + +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 tox diff --git a/.travis/run.sh b/.travis/run.sh new file mode 100755 index 0000000..40a0750 --- /dev/null +++ b/.travis/run.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +set -e +set -x + +if [[ "${TOXENV}" == "pypy" ]]; then + PYENV_ROOT="$HOME/.pyenv" + PATH="$PYENV_ROOT/bin:$PATH" + eval "$(pyenv init -)" + pyenv global pypy-2.6.0 +fi + +tox |