From 52c42b6927645292994c87bb35be13bdfc0c13a8 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Wed, 9 Jan 2019 15:08:47 -0800
Subject: [PATCH] Install homebrew packages through .travis.yml.

---
 .travis.yml                 | 11 ++++++++++-
 tests/travis-macos-setup.sh | 17 -----------------
 2 files changed, 10 insertions(+), 18 deletions(-)
 delete mode 100755 tests/travis-macos-setup.sh

diff --git a/.travis.yml b/.travis.yml
index 98193a779..5af8908c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,6 @@ before_install:
   - cp .travis.yml /tmp/travis.yml
   - git pull origin master --strategy=recursive --strategy-option=theirs --no-edit
   - if ! git diff .travis.yml /tmp/travis.yml ; then echo "Please merge master into test-everything"; exit 1; fi
-  - '[ "$TRAVIS_OS_NAME" != osx ] || tests/travis-macos-setup.sh'
 
 before_script:
   - 'if [ $TRAVIS_OS_NAME = osx ] ; then ulimit -n 1024 ; fi'
@@ -122,9 +121,19 @@ matrix:
     - language: generic
       env: TOXENV=py27
       os: osx
+      addons:
+        homebrew:
+          packages:
+            - augeas
+            - python2
     - language: generic
       env: TOXENV=py3
       os: osx
+      addons:
+        homebrew:
+          packages:
+            - augeas
+            - python3
 
 
 # Only build pushes to the master branch, PRs, and branches beginning with
diff --git a/tests/travis-macos-setup.sh b/tests/travis-macos-setup.sh
deleted file mode 100755
index bf72f26a5..000000000
--- a/tests/travis-macos-setup.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash -e
-#
-# Set up the test environment for macOS on Travis.
-
-# Install the given package with brew if it's not already installed.
-brew_install() {
-    if ! brew list "$1" > /dev/null 2>&1; then
-        brew install "$1"
-    fi
-}
-
-brew_install augeas
-brew_install python
-brew_install python3
-
-# Ensure we use python from brew.
-brew link python