diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-09-18 08:58:34 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-09-18 09:37:17 -0500 |
| commit | b337d5765868a6c1cddc9b10efe06f5af3f99232 (patch) | |
| tree | 48852d614afedb7ee264b4c411d41cb3f0443946 /.travis | |
| parent | 27f02a38fe66b547d377e8e15ad5577f3902fde4 (diff) | |
| download | cryptography-b337d5765868a6c1cddc9b10efe06f5af3f99232.tar.gz cryptography-b337d5765868a6c1cddc9b10efe06f5af3f99232.tar.bz2 cryptography-b337d5765868a6c1cddc9b10efe06f5af3f99232.zip | |
pypy 2.6.1 has a bug where it can segfault during vector install
This PR changes our tests to run against the latest nightly for now. We
should change it back when pypy 2.7 is out.
Diffstat (limited to '.travis')
| -rwxr-xr-x | .travis/install.sh | 11 | ||||
| -rwxr-xr-x | .travis/run.sh | 1 |
2 files changed, 6 insertions, 6 deletions
diff --git a/.travis/install.sh b/.travis/install.sh index 1e625509..114c7de1 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -38,8 +38,8 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then pyenv global 3.5.0 ;; pypy) - pyenv install pypy-2.6.1 - pyenv global pypy-2.6.1 + pyenv install pypy-c-jit-latest + pyenv global pypy-c-jit-latest ;; pypy3) pyenv install pypy3-2.4.0 @@ -53,14 +53,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 + # temporary pyenv installation to get latest pypy before container infra upgrade + # now using the -latest because of a segfault bug we're encountering in 2.6.1 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.1 - pyenv global pypy-2.6.1 + pyenv install pypy-c-jit-latest + pyenv global pypy-c-jit-latest fi pip install virtualenv fi diff --git a/.travis/run.sh b/.travis/run.sh index 3667b333..cf1bbe28 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -26,7 +26,6 @@ else PYENV_ROOT="$HOME/.pyenv" PATH="$PYENV_ROOT/bin:$PATH" eval "$(pyenv init -)" - pyenv global pypy-2.6.1 fi fi source ~/.venv/bin/activate |