commit f8fed42f0cb79ca2a0f99444cd6f3c173391b069
author Paul Kehrer <paul.l.kehrer@gmail.com> Tue Sep 01 22:26:30 2015 -0500
committer Paul Kehrer <paul.l.kehrer@gmail.com> Tue Sep 01 22:26:30 2015 -0500
tree ce645fe34ff606a8298d8c5f81309b56bee06639
parent f3e8aae5c001e643ec46ec8a55aa1c5c1ac097ae
parent 18fab258a2c06e4c86765ebc74507f0a3f26fa07

Merge pull request #2316 from pyca/pypy-2.6.1

upgrade to pypy 2.6.1

.travis/install.sh

diff --git a/.travis/install.sh b/.travis/install.sh
index 17aee43..3ff723d 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -35,8 +35,8 @@
             ;;
         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 @@
         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

.travis/run.sh

diff --git a/.travis/run.sh b/.travis/run.sh
index 1735865..1c49911 100755
--- a/.travis/run.sh
+++ b/.travis/run.sh
@@ -21,7 +21,7 @@
         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