From dbc655a30c7da9dd45a47b7ded3cc88d6345cb32 Mon Sep 17 00:00:00 2001
From: dylan araps <dylan.araps@gmail.com>
Date: Mon, 11 Sep 2017 08:43:02 +1000
Subject: travis: Add macOS testing

---
 .travis.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 1c9b3d8..efa3271 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,15 @@ python:
     - "3.5"
     - "3.6"
 
+os:
+    - "linux"
+    - "osx"
+
 before_install:
-    - sudo apt-get -qq update
-    - sudo apt-get install -y imagemagick
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install imagemagick; fi
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; sudo apt-get -qq update; fi
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; sudo apt-get install -y imagemagick; fi
 
 install:
     - pip install flake8 pylint
-- 
cgit v1.2.3


From 7e8f7c2620be08664685550936da8eace1a7cbad Mon Sep 17 00:00:00 2001
From: dylan araps <dylan.araps@gmail.com>
Date: Mon, 11 Sep 2017 08:46:00 +1000
Subject: travis: Add macOS testing

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index efa3271..d136a5f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,10 +8,10 @@ os:
     - "osx"
 
 before_install:
-    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
-    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install imagemagick; fi
-    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; sudo apt-get -qq update; fi
-    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; sudo apt-get install -y imagemagick; fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo brew update; fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo brew install imagemagick; fi
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -qq update; fi
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y imagemagick; fi
 
 install:
     - pip install flake8 pylint
-- 
cgit v1.2.3


From 50c6ba020572f438aa608035224cc3de73f0e2ee Mon Sep 17 00:00:00 2001
From: dylan araps <dylan.araps@gmail.com>
Date: Tue, 12 Sep 2017 08:40:22 +1000
Subject: travis: Fix macOS

---
 .travis.yml | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index d136a5f..2ec3221 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,22 @@
 language: python
-python:
-    - "3.5"
-    - "3.6"
 
-os:
-    - "linux"
-    - "osx"
+matrix:
+    include:
+        - os: osx
+          language: generic
+          before_install:
+              - brew update
+              - brew install imagemagick
+              - brew install python3
+              - virtualenv env -p python3
+              - source env/bin/activate
+        - os: linux
+          python: 3.5
+        - os: linux
+          python: 3.6
+
 
 before_install:
-    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo brew update; fi
-    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo brew install imagemagick; fi
     - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -qq update; fi
     - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y imagemagick; fi
 
-- 
cgit v1.2.3


From 93ea9b519e0c741e937f3374adce7e1939614099 Mon Sep 17 00:00:00 2001
From: dylan araps <dylan.araps@gmail.com>
Date: Tue, 12 Sep 2017 08:46:03 +1000
Subject: travis: Fix macOS

---
 .travis.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 2ec3221..07b67cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,11 +5,9 @@ matrix:
         - os: osx
           language: generic
           before_install:
-              - brew update
               - brew install imagemagick
               - brew install python3
-              - virtualenv env -p python3
-              - source env/bin/activate
+              - brew link --overwite python3
         - os: linux
           python: 3.5
         - os: linux
-- 
cgit v1.2.3


From d56bcf2002cb7316ad18ec8ac8a3209f2b51416a Mon Sep 17 00:00:00 2001
From: dylan araps <dylan.araps@gmail.com>
Date: Mon, 25 Sep 2017 08:51:24 +1000
Subject: travis: Fix macos builds

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 07b67cc..97204bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,8 @@ matrix:
           before_install:
               - brew install imagemagick
               - brew install python3
-              - brew link --overwite python3
+              - virtualenv env -p python3
+              - source env/bin/activate
         - os: linux
           python: 3.5
         - os: linux
-- 
cgit v1.2.3