diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-09-04 12:00:43 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-09-04 12:00:43 -0500 |
| commit | 8359190f6e509fa2d12c0d86c9dfd1a8b35bf9cb (patch) | |
| tree | 37436d6d1502532d40e78b3ea337cd084f59622e /.travis | |
| parent | 7402cf1c676ffb7ba48d6e90227bb4b1397af12d (diff) | |
| parent | cad58d7bfa1a01ade66828498dcb2894993838b9 (diff) | |
| download | cryptography-8359190f6e509fa2d12c0d86c9dfd1a8b35bf9cb.tar.gz cryptography-8359190f6e509fa2d12c0d86c9dfd1a8b35bf9cb.tar.bz2 cryptography-8359190f6e509fa2d12c0d86c9dfd1a8b35bf9cb.zip | |
Merge branch 'master' into static-linking-osx
Diffstat (limited to '.travis')
| -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 1ce8011f..3667b333 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -26,7 +26,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 |