commit a335867bb42995e0537fa1ae13a955b618a98ab3
author Paul Kehrer <paul.l.kehrer@gmail.com> Sun Nov 01 22:33:28 2015 +0900
committer Paul Kehrer <paul.l.kehrer@gmail.com> Sun Nov 01 22:33:28 2015 +0900
tree 2c9f0ac84892721f22f3b4813e6da7c0acb10c29
parent a22d52b99f0587ca653087854e1da5ff72a19583
parent 62c126f194199360491cd0e7f1b3fbd6b040a41b

Merge pull request #2461 from alex/typos

corrected a few typos in comments

.travis/install.sh

diff --git a/.travis/install.sh b/.travis/install.sh
index 21e4152..63d55ed 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -5,16 +5,16 @@
 
 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)
@@ -38,8 +38,8 @@
             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

.travis/run.sh

diff --git a/.travis/run.sh b/.travis/run.sh
index cf1bbe2..bda9b54 100755
--- a/.travis/run.sh
+++ b/.travis/run.sh
@@ -4,7 +4,11 @@
 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"