diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-09-10 07:12:45 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-09-10 07:12:45 -0400 |
| commit | 92d8bd12609586bfa53cf8c7a691e37474aeccd1 (patch) | |
| tree | a66e0c8b258b1ef7fa6ae335a244a461ebefd900 | |
| parent | 6aa52b28d6d9d367d42aa65a5acce039e76ef89d (diff) | |
| parent | 0a19e61d215f733be3141234958f14f046a73999 (diff) | |
| download | cryptography-92d8bd12609586bfa53cf8c7a691e37474aeccd1.tar.gz cryptography-92d8bd12609586bfa53cf8c7a691e37474aeccd1.tar.bz2 cryptography-92d8bd12609586bfa53cf8c7a691e37474aeccd1.zip | |
Merge pull request #2332 from reaperhulk/upgrade-osx-builders
upgrade os x travis jobs to use latest image
| -rw-r--r-- | .travis.yml | 24 | ||||
| -rwxr-xr-x | .travis/install.sh | 6 |
2 files changed, 14 insertions, 16 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: 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 ;; |