From 4d771503e231ebfe66dda06efa6ca2453926e0b6 Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Sun, 1 Nov 2015 15:34:23 +0900
Subject: switch to directly grabbing pyenv rather than using homebrew on mac

---
 .travis/install.sh | 10 +++++-----
 .travis/run.sh     |  4 ++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.travis/install.sh b/.travis/install.sh
index 21e41523..bab2a173 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -5,16 +5,16 @@ set -x
 
 if [[ "$(uname -s)" == 'Darwin' ]]; then
     brew update || brew update
-    brew install pyenv
-    brew outdated pyenv || brew upgrade pyenv
 
     if [[ "${OPENSSL}" != "0.9.8" ]]; then
         brew outdated openssl || brew upgrade openssl
     fi
 
-    if which -s pyenv; then
-        eval "$(pyenv init -)"
-    fi
+    # install pyenv
+    git clone https://github.com/yyuu/pyenv.git ~/.pyenv
+    PYENV_ROOT="$HOME/.pyenv"
+    PATH="$PYENV_ROOT/bin:$PATH"
+    eval "$(pyenv init -)"
 
     case "${TOXENV}" in
         py26)
diff --git a/.travis/run.sh b/.travis/run.sh
index cf1bbe28..bda9b545 100755
--- a/.travis/run.sh
+++ b/.travis/run.sh
@@ -4,7 +4,11 @@ set -e
 set -x
 
 if [[ "$(uname -s)" == "Darwin" ]]; then
+    # initialize our pyenv
+    PYENV_ROOT="$HOME/.pyenv"
+    PATH="$PYENV_ROOT/bin:$PATH"
     eval "$(pyenv init -)"
+
     if [[ "${OPENSSL}" != "0.9.8" ]]; then
         # set our flags to use homebrew openssl
         export ARCHFLAGS="-arch x86_64"
-- 
cgit v1.2.3


From 2be252fe50de8ca896490aa4fed2e7a6fcb231ea Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Sun, 1 Nov 2015 15:35:02 +0900
Subject: use pypy4 on mac

---
 .travis/install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis/install.sh b/.travis/install.sh
index bab2a173..63d55ed3 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-c-jit-latest
-            pyenv global pypy-c-jit-latest
+            pyenv install pypy-4.0.0
+            pyenv global pypy-4.0.0
             ;;
         pypy3)
             pyenv install pypy3-2.4.0
-- 
cgit v1.2.3