From 6850c1362043b5bf5412fa2f556d8ba10343331b Mon Sep 17 00:00:00 2001 From: "Julien Vehent [:ulfr]" Date: Thu, 29 Dec 2016 21:20:08 -0500 Subject: [PATCH 1/2] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cf13a30fd..a7571bd82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,7 +55,7 @@ addons: - gnupg before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libffi libyaml python; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libffi libyaml; fi install: - if [[ "$TRAVIS_OS_NAME" == "linux" && ! -z $TOX_ENV ]]; then pip install tox; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then if [ $SYSTEM_TEST -eq 1 ]; then sudo pip install -r requirements.txt; else pip install -r requirements.txt; fi; fi From 4e8f9680ea357dc819d630743a625d90e7a6b920 Mon Sep 17 00:00:00 2001 From: Julien Vehent Date: Fri, 6 Jan 2017 11:42:29 -0500 Subject: [PATCH 2/2] Install gnupg via brew --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a7571bd82..a7c19bd01 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,7 +55,7 @@ addons: - gnupg before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libffi libyaml; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libffi libyaml gpg2; fi install: - if [[ "$TRAVIS_OS_NAME" == "linux" && ! -z $TOX_ENV ]]; then pip install tox; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then if [ $SYSTEM_TEST -eq 1 ]; then sudo pip install -r requirements.txt; else pip install -r requirements.txt; fi; fi