From f8b348cc41ffdda41e82e91f2a2ef1f0afddb97c Mon Sep 17 00:00:00 2001
From: Andy Freeland <andy@andyfreeland.net>
Date: Wed, 26 Jul 2017 08:07:41 -0700
Subject: [PATCH] Fix Travis for OS X

`brew install gpg2` now fails since `gnupg` is already installed.
Instead, `brew upgrade gnupg`.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a7c19bd01..58976e1ef 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 gpg2; fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libyaml; brew upgrade gnupg; 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