From 4e1dd2e0e35ce3880380af2c6fa278de87b0df2f Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 2 May 2015 17:36:11 -0400 Subject: Opt in to travis's new OS X infrastructure which should be faster --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index c7413ea9..559d6700 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,12 @@ sudo: false +osx_image: beta-xcode6.2 + language: python + cache: directories: - $HOME/.cache/pip + matrix: include: - python: 2.6 # these are just to make travis's UI a bit prettier -- cgit v1.2.3 From 6ac7230f61486de1546df06a5bdef24f6cc34a49 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Thu, 14 May 2015 23:33:58 -0400 Subject: set osx_image on all the os x builds, instead of global --- .travis.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 559d6700..5be093de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ sudo: false -osx_image: beta-xcode6.2 language: python @@ -71,42 +70,55 @@ matrix: env: TOXENV=py3pep8 - language: generic os: osx + osx_image: beta-xcode6.2 env: TOXENV=py26 - language: generic os: osx + osx_image: beta-xcode6.2 env: TOXENV=py27 - language: generic os: osx + osx_image: beta-xcode6.2 env: TOXENV=py33 - language: generic os: osx + osx_image: beta-xcode6.2 env: TOXENV=py34 - language: generic os: osx + osx_image: beta-xcode6.2 env: TOXENV=pypy - language: generic os: osx + osx_image: beta-xcode6.2 env: TOXENV=pypy3 - language: generic os: osx + osx_image: beta-xcode6.2 env: TOXENV=py26 OPENSSL=0.9.8 - language: generic os: osx + osx_image: beta-xcode6.2 env: TOXENV=py27 OPENSSL=0.9.8 - language: generic os: osx + osx_image: beta-xcode6.2 env: TOXENV=py33 OPENSSL=0.9.8 - language: generic os: osx + osx_image: beta-xcode6.2 env: TOXENV=py34 OPENSSL=0.9.8 - language: generic os: osx + osx_image: beta-xcode6.2 env: TOXENV=pypy OPENSSL=0.9.8 - language: generic os: osx + osx_image: beta-xcode6.2 env: TOXENV=pypy3 OPENSSL=0.9.8 - language: generic os: osx + osx_image: beta-xcode6.2 env: TOXENV=docs install: -- cgit v1.2.3 From 63d95d0973970c01dbfa8432055bc7e13acc1049 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Fri, 15 May 2015 07:13:21 -0400 Subject: Try to use python -m, not clear why it's needed --- .travis/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/install.sh b/.travis/install.sh index 9e14a92d..f5873288 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -49,7 +49,7 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then ;; esac pyenv rehash - pip install --user virtualenv + python -m pip install --user virtualenv else pip install virtualenv fi -- cgit v1.2.3 From c41667e1dbe332f771d34b9e7d98244bbe5a13f5 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Mon, 18 May 2015 18:27:00 -0400 Subject: Use xcode 6.3, so tests will pass --- .travis.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5be093de..343576fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,55 +70,55 @@ matrix: env: TOXENV=py3pep8 - language: generic os: osx - osx_image: beta-xcode6.2 + osx_image: beta-xcode6.3 env: TOXENV=py26 - language: generic os: osx - osx_image: beta-xcode6.2 + osx_image: beta-xcode6.3 env: TOXENV=py27 - language: generic os: osx - osx_image: beta-xcode6.2 + osx_image: beta-xcode6.3 env: TOXENV=py33 - language: generic os: osx - osx_image: beta-xcode6.2 + osx_image: beta-xcode6.3 env: TOXENV=py34 - language: generic os: osx - osx_image: beta-xcode6.2 + osx_image: beta-xcode6.3 env: TOXENV=pypy - language: generic os: osx - osx_image: beta-xcode6.2 + osx_image: beta-xcode6.3 env: TOXENV=pypy3 - language: generic os: osx - osx_image: beta-xcode6.2 + osx_image: beta-xcode6.3 env: TOXENV=py26 OPENSSL=0.9.8 - language: generic os: osx - osx_image: beta-xcode6.2 + osx_image: beta-xcode6.3 env: TOXENV=py27 OPENSSL=0.9.8 - language: generic os: osx - osx_image: beta-xcode6.2 + osx_image: beta-xcode6.3 env: TOXENV=py33 OPENSSL=0.9.8 - language: generic os: osx - osx_image: beta-xcode6.2 + osx_image: beta-xcode6.3 env: TOXENV=py34 OPENSSL=0.9.8 - language: generic os: osx - osx_image: beta-xcode6.2 + osx_image: beta-xcode6.3 env: TOXENV=pypy OPENSSL=0.9.8 - language: generic os: osx - osx_image: beta-xcode6.2 + osx_image: beta-xcode6.3 env: TOXENV=pypy3 OPENSSL=0.9.8 - language: generic os: osx - osx_image: beta-xcode6.2 + osx_image: beta-xcode6.3 env: TOXENV=docs install: -- cgit v1.2.3 From 9c34652c5d5aa6224bb8bb3f94c4444b43b57730 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Mon, 18 May 2015 18:54:26 -0400 Subject: Don't try to upgrade brew packages if they are at the latest version --- .travis/install.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index 1baae5ba..7c3e9de2 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -7,7 +7,7 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then brew update || brew update if [[ "${OPENSSL}" != "0.9.8" ]]; then - brew upgrade openssl + brew outdated openssl || brew upgrade openssl fi if which pyenv > /dev/null; then @@ -24,22 +24,22 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then python get-pip.py --user ;; py33) - brew upgrade pyenv + brew outdated pyenv || brew upgrade pyenv pyenv install 3.3.6 pyenv global 3.3.6 ;; py34) - brew upgrade pyenv + brew outdated pyenv || brew upgrade pyenv pyenv install 3.4.2 pyenv global 3.4.2 ;; pypy) - brew upgrade pyenv + brew outdated pyenv || brew upgrade pyenv pyenv install pypy-2.5.1 pyenv global pypy-2.5.1 ;; pypy3) - brew upgrade pyenv + brew outdated pyenv || brew upgrade pyenv pyenv install pypy3-2.4.0 pyenv global pypy3-2.4.0 ;; -- cgit v1.2.3