From f5cdb1ea3fb308d4de911dceca774489e09331cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Bj=C3=A4reholt?= <erik@bjareho.lt>
Date: Tue, 25 Apr 2017 21:13:12 +0200
Subject: [PATCH 1/3] [ci/macos] Changed Python installation method, should fix
 packaging

---
 scripts/setup_venv_osx.sh | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/scripts/setup_venv_osx.sh b/scripts/setup_venv_osx.sh
index adf260f6..6c91caa5 100755
--- a/scripts/setup_venv_osx.sh
+++ b/scripts/setup_venv_osx.sh
@@ -1,8 +1,19 @@
 #!/bin/bash
 
-brew update;
-brew install python3;
-pip3 install --upgrade virtualenv;
+function install_with_brew() {
+    # Will get the latest version in brew.
+    # As of writing, 3.6 and later won't work with PyInstaller so this method is avoided for now.
+    brew update;
+    brew install python3;
+}
+
+function install_with_pkg() {
+    wget -O python3.pkg https://www.python.org/ftp/python/3.5.2/python-3.5.2-macosx10.6.pkg;
+    sudo installer -pkg python3.pkg -target /;
+}
+
+install_with_pkg
+pip3 install --upgrade pip virtualenv;
 virtualenv venv -p python3;
 
 # Now run `source venv/bin/activate` in the shell where the virtualenv should be used

From c51407f7b315dd44412b81456d7596c03695475c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Bj=C3=A4reholt?= <erik@bjareho.lt>
Date: Tue, 25 Apr 2017 21:22:43 +0200
Subject: [PATCH 2/3] [ci/macos] fixed missing testing dependency pytest on
 macOS

---
 .travis.yml               | 4 +---
 scripts/setup_venv_osx.sh | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ca629cee..476d3133 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,9 +62,7 @@ before_install:
  - pip install --upgrade pip
  - python --version
  - pip --version
- - pip install PyQt5
- - pip install pyinstaller
- - pip install --upgrade nose
+ - pip install --upgrade pytest pyinstaller
  - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION
 
 install:
diff --git a/scripts/setup_venv_osx.sh b/scripts/setup_venv_osx.sh
index 6c91caa5..f9caec02 100755
--- a/scripts/setup_venv_osx.sh
+++ b/scripts/setup_venv_osx.sh
@@ -13,7 +13,7 @@ function install_with_pkg() {
 }
 
 install_with_pkg
-pip3 install --upgrade pip virtualenv;
+pip3 install --upgrade virtualenv;
 virtualenv venv -p python3;
 
 # Now run `source venv/bin/activate` in the shell where the virtualenv should be used

From 6b242f5bd4213d465feba36cba105ffc3ea35c48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Bj=C3=A4reholt?= <erik@bjareho.lt>
Date: Tue, 25 Apr 2017 22:26:12 +0200
Subject: [PATCH 3/3] [ci/macos] removed macOS from allowed failures

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 476d3133..bccae496 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,7 +52,6 @@ matrix:
   allow_failures:
    - python: 3.6
    - python: nightly
-   - os: osx
 
 before_install:
  - if [[ "$TRAVIS_OS_NAME" == "osx" ]];