From 3ca143c45e41f4ef9f187688ef015151311921cd Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Wed, 9 Sep 2015 21:02:14 -0500
Subject: upgrade os x travis jobs to use latest image

---
 .travis.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f1c3567d..61d3b10a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -70,51 +70,51 @@ matrix:
           env: TOXENV=py3pep8
         - language: generic
           os: osx
-          osx_image: beta-xcode6.3
+          osx_image: xcode7
           env: TOXENV=py26 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1
         - language: generic
           os: osx
-          osx_image: beta-xcode6.3
+          osx_image: xcode7
           env: TOXENV=py27 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1
         - language: generic
           os: osx
-          osx_image: beta-xcode6.3
+          osx_image: xcode7
           env: TOXENV=py33 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1
         - language: generic
           os: osx
-          osx_image: beta-xcode6.3
+          osx_image: xcode7
           env: TOXENV=py34 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1
         - language: generic
           os: osx
-          osx_image: beta-xcode6.3
+          osx_image: xcode7
           env: TOXENV=pypy CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1
         - language: generic
           os: osx
-          osx_image: beta-xcode6.3
+          osx_image: xcode7
           env: TOXENV=py27 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=0
         - language: generic
           os: osx
-          osx_image: beta-xcode6.3
+          osx_image: xcode7
           env: TOXENV=py26 OPENSSL=0.9.8
         - language: generic
           os: osx
-          osx_image: beta-xcode6.3
+          osx_image: xcode7
           env: TOXENV=py27 OPENSSL=0.9.8
         - language: generic
           os: osx
-          osx_image: beta-xcode6.3
+          osx_image: xcode7
           env: TOXENV=py33 OPENSSL=0.9.8
         - language: generic
           os: osx
-          osx_image: beta-xcode6.3
+          osx_image: xcode7
           env: TOXENV=py34 OPENSSL=0.9.8
         - language: generic
           os: osx
-          osx_image: beta-xcode6.3
+          osx_image: xcode7
           env: TOXENV=pypy OPENSSL=0.9.8
         - language: generic
           os: osx
-          osx_image: beta-xcode6.3
+          osx_image: xcode7
           env: TOXENV=docs
 
 install:
-- 
cgit v1.2.3


From 0a19e61d215f733be3141234958f14f046a73999 Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Wed, 9 Sep 2015 21:21:21 -0500
Subject: install/upgrade pyenv in os x builders

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

diff --git a/.travis/install.sh b/.travis/install.sh
index 8e791b37..929cf48b 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -5,6 +5,8 @@ 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
@@ -24,22 +26,18 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
             python get-pip.py --user
             ;;
         py33)
-            brew outdated pyenv || brew upgrade pyenv
             pyenv install 3.3.6
             pyenv global 3.3.6
             ;;
         py34)
-            brew outdated pyenv || brew upgrade pyenv
             pyenv install 3.4.2
             pyenv global 3.4.2
             ;;
         pypy)
-            brew outdated pyenv || brew upgrade pyenv
             pyenv install pypy-2.6.1
             pyenv global pypy-2.6.1
             ;;
         pypy3)
-            brew outdated pyenv || brew upgrade pyenv
             pyenv install pypy3-2.4.0
             pyenv global pypy3-2.4.0
             ;;
-- 
cgit v1.2.3