diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-09-01 22:26:30 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-09-01 22:26:30 -0500 |
| commit | f8fed42f0cb79ca2a0f99444cd6f3c173391b069 (patch) | |
| tree | ce645fe34ff606a8298d8c5f81309b56bee06639 | |
| parent | f3e8aae5c001e643ec46ec8a55aa1c5c1ac097ae (diff) | |
| parent | 18fab258a2c06e4c86765ebc74507f0a3f26fa07 (diff) | |
| download | cryptography-f8fed42f0cb79ca2a0f99444cd6f3c173391b069.tar.gz cryptography-f8fed42f0cb79ca2a0f99444cd6f3c173391b069.tar.bz2 cryptography-f8fed42f0cb79ca2a0f99444cd6f3c173391b069.zip | |
Merge pull request #2316 from pyca/pypy-2.6.1
upgrade to pypy 2.6.1
| -rwxr-xr-x | .travis/install.sh | 8 | ||||
| -rwxr-xr-x | .travis/run.sh | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.travis/install.sh b/.travis/install.sh index 17aee435..3ff723da 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -35,8 +35,8 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then ;; pypy) brew outdated pyenv || brew upgrade pyenv - pyenv install pypy-2.6.0 - pyenv global pypy-2.6.0 + pyenv install pypy-2.6.1 + pyenv global pypy-2.6.1 ;; pypy3) brew outdated pyenv || brew upgrade pyenv @@ -57,8 +57,8 @@ else PYENV_ROOT="$HOME/.pyenv" PATH="$PYENV_ROOT/bin:$PATH" eval "$(pyenv init -)" - pyenv install pypy-2.6.0 - pyenv global pypy-2.6.0 + pyenv install pypy-2.6.1 + pyenv global pypy-2.6.1 fi pip install virtualenv fi diff --git a/.travis/run.sh b/.travis/run.sh index 17358655..1c49911f 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -21,7 +21,7 @@ else PYENV_ROOT="$HOME/.pyenv" PATH="$PYENV_ROOT/bin:$PATH" eval "$(pyenv init -)" - pyenv global pypy-2.6.0 + pyenv global pypy-2.6.1 fi fi source ~/.venv/bin/activate |