From 8720e6341522754c139639992fb0f6e6ea0c4bc9 Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sat, 14 Mar 2020 14:06:34 +0000
Subject: [PATCH 01/28] Workaround for OSX deploy issues

---
 travis/macos-deploy.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/travis/macos-deploy.sh b/travis/macos-deploy.sh
index 2b192b9..91dfe4a 100755
--- a/travis/macos-deploy.sh
+++ b/travis/macos-deploy.sh
@@ -11,3 +11,9 @@ mkdir dist/Syncplay.app/Contents/Resources/es_419.lproj
 pip3 install dmgbuild
 mv syncplay/resources/macOS_readme.pdf syncplay/resources/.macOS_readme.pdf
 dmgbuild -s appdmg.py "Syncplay" dist_bintray/Syncplay_${VER}.dmg
+
+# Workaround for deployment issues with newer openssl.
+# See https://travis-ci.community/t/ruby-openssl-python-deployment-fails-on-osx-image/6753/9
+for lib in ssl crypto; do ln -s /usr/local/opt/openssl{@1.0,}/lib/lib${lib}.1.0.0.dylib; done
+rvm reinstall $(travis_internal_ruby) --disable-binary
+for lib in ssl crypto; do rm /usr/local/opt/openssl/lib/lib${lib}.1.0.0.dylib; done

From e9a74fab13a0f8b29b5e6f13aef5aff3a0a93c81 Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sat, 14 Mar 2020 14:16:37 +0000
Subject: [PATCH 02/28] Homebrew already has python 3 installed, so don't need
 to update

---
 travis/macos-install.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/travis/macos-install.sh b/travis/macos-install.sh
index 78b6425..580ed1d 100755
--- a/travis/macos-install.sh
+++ b/travis/macos-install.sh
@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-brew update
-brew upgrade python
 which python3
 python3 --version
 which pip3

From 94637bb65d900ade830f24c65336b04f58bc707c Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sat, 14 Mar 2020 14:24:35 +0000
Subject: [PATCH 03/28] Skip the openssl workaround now we're no longer
 upgrading openssl

---
 travis/macos-deploy.sh | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/travis/macos-deploy.sh b/travis/macos-deploy.sh
index 91dfe4a..97214e9 100755
--- a/travis/macos-deploy.sh
+++ b/travis/macos-deploy.sh
@@ -10,10 +10,4 @@ mkdir dist/Syncplay.app/Contents/Resources/Spanish.lproj
 mkdir dist/Syncplay.app/Contents/Resources/es_419.lproj
 pip3 install dmgbuild
 mv syncplay/resources/macOS_readme.pdf syncplay/resources/.macOS_readme.pdf
-dmgbuild -s appdmg.py "Syncplay" dist_bintray/Syncplay_${VER}.dmg
-
-# Workaround for deployment issues with newer openssl.
-# See https://travis-ci.community/t/ruby-openssl-python-deployment-fails-on-osx-image/6753/9
-for lib in ssl crypto; do ln -s /usr/local/opt/openssl{@1.0,}/lib/lib${lib}.1.0.0.dylib; done
-rvm reinstall $(travis_internal_ruby) --disable-binary
-for lib in ssl crypto; do rm /usr/local/opt/openssl/lib/lib${lib}.1.0.0.dylib; done
+dmgbuild -s appdmg.py "Syncplay" dist_bintray/Syncplay_${VER}.dmg
\ No newline at end of file

From c4fa7f7a9aaf39c9349bd0d2ec4a3bf439a3bc35 Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sat, 14 Mar 2020 17:21:23 +0000
Subject: [PATCH 04/28] Redo travis config in line with modern options

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

diff --git a/.travis.yml b/.travis.yml
index 167bfb3..b245471 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,22 @@
-matrix:
+# These two are defaults, which get overriden by the jobs matrix
+language: minimal
+os: linux
+
+jobs:
   include:
     - language: objective-c
+      os: osx
       osx_image: xcode8.3
     - language: bash
-      sudo: required
       dist: xenial
+      os: linux
       env: BUILD_DESTINATION=snapcraft
     - language: python
-      sudo: required
+      os: linux
       dist: xenial
       python: 3.6
       env: BUILD_DESTINATION=appimage
 
-branches:
-  only:
-  - master
-
 script:
 - if [ "$TRAVIS_OS_NAME" == "osx" ]; then python3 buildPy2app.py py2app ; fi
 - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$BUILD_DESTINATION" == "snapcraft" ]; then sudo snapcraft cleanbuild ; fi

From a93f13f9abb1e169a14b3382bd851af5a615505e Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sat, 14 Mar 2020 17:24:48 +0000
Subject: [PATCH 05/28] Explicitly install Python from homebrew

---
 travis/macos-install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/travis/macos-install.sh b/travis/macos-install.sh
index 580ed1d..061e0a7 100755
--- a/travis/macos-install.sh
+++ b/travis/macos-install.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+brew install python
 which python3
 python3 --version
 which pip3

From 6f6f35704e1139364f8e2c9c9cf2aef46eb9df63 Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sat, 14 Mar 2020 17:25:24 +0000
Subject: [PATCH 06/28] Bash is alias for minimal

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

diff --git a/.travis.yml b/.travis.yml
index b245471..13e3617 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ jobs:
     - language: objective-c
       os: osx
       osx_image: xcode8.3
-    - language: bash
+    - language: minimal
       dist: xenial
       os: linux
       env: BUILD_DESTINATION=snapcraft

From 6faf25b9481d9baab5ae7844110b56fdbb26f570 Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sat, 14 Mar 2020 17:32:36 +0000
Subject: [PATCH 07/28] Explicitly install Python 3

---
 travis/macos-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/travis/macos-install.sh b/travis/macos-install.sh
index 061e0a7..ad17e25 100755
--- a/travis/macos-install.sh
+++ b/travis/macos-install.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-brew install python
+brew install python3
 which python3
 python3 --version
 which pip3

From afaad1f766ae9e5a88d44bb8fe255fe98e99bf21 Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sat, 14 Mar 2020 17:34:01 +0000
Subject: [PATCH 08/28] If any part of the osx install fails, stop

---
 travis/macos-install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/travis/macos-install.sh b/travis/macos-install.sh
index ad17e25..1e873c9 100755
--- a/travis/macos-install.sh
+++ b/travis/macos-install.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -e
+
 brew install python3
 which python3
 python3 --version

From b6e17e08f09dbf01c603f39b602ba3d83d08d806 Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sat, 14 Mar 2020 17:41:56 +0000
Subject: [PATCH 09/28] Use stock pyside

---
 travis/macos-install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/travis/macos-install.sh b/travis/macos-install.sh
index 1e873c9..3ffea03 100755
--- a/travis/macos-install.sh
+++ b/travis/macos-install.sh
@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 
-set -e
+set -ex
 
 brew install python3
 which python3
 python3 --version
 which pip3
 pip3 --version
-brew install albertosottile/syncplay/pyside
+brew install pyside
 python3 -c "from PySide2 import __version__; print(__version__)"
 python3 -c "from PySide2.QtCore import __version__; print(__version__)" 
 pip3 install py2app

From a4e84ac65c9d97c707a03e8a0be8fd5aae353cd7 Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sat, 14 Mar 2020 17:45:45 +0000
Subject: [PATCH 10/28] Re-add brew update

---
 travis/macos-install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/travis/macos-install.sh b/travis/macos-install.sh
index 3ffea03..51dd1ac 100755
--- a/travis/macos-install.sh
+++ b/travis/macos-install.sh
@@ -2,6 +2,7 @@
 
 set -ex
 
+brew update
 brew install python3
 which python3
 python3 --version

From 41d0152f2845088db4245489845d6b8bf0125bfa Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sat, 14 Mar 2020 18:01:28 +0000
Subject: [PATCH 11/28] Go back to upgrading python...

---
 travis/macos-install.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/travis/macos-install.sh b/travis/macos-install.sh
index 51dd1ac..2da30ef 100755
--- a/travis/macos-install.sh
+++ b/travis/macos-install.sh
@@ -2,8 +2,9 @@
 
 set -ex
 
+export HOMEBREW_NO_INSTALL_CLEANUP=1
 brew update
-brew install python3
+brew upgrade python
 which python3
 python3 --version
 which pip3

From baec200c8cda21a9c4333369084a27dc5cc5822f Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sat, 14 Mar 2020 18:01:58 +0000
Subject: [PATCH 12/28] Revert "Skip the openssl workaround now we're no longer
 upgrading openssl"

This reverts commit 94637bb65d900ade830f24c65336b04f58bc707c.
---
 travis/macos-deploy.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/travis/macos-deploy.sh b/travis/macos-deploy.sh
index 97214e9..91dfe4a 100755
--- a/travis/macos-deploy.sh
+++ b/travis/macos-deploy.sh
@@ -10,4 +10,10 @@ mkdir dist/Syncplay.app/Contents/Resources/Spanish.lproj
 mkdir dist/Syncplay.app/Contents/Resources/es_419.lproj
 pip3 install dmgbuild
 mv syncplay/resources/macOS_readme.pdf syncplay/resources/.macOS_readme.pdf
-dmgbuild -s appdmg.py "Syncplay" dist_bintray/Syncplay_${VER}.dmg
\ No newline at end of file
+dmgbuild -s appdmg.py "Syncplay" dist_bintray/Syncplay_${VER}.dmg
+
+# Workaround for deployment issues with newer openssl.
+# See https://travis-ci.community/t/ruby-openssl-python-deployment-fails-on-osx-image/6753/9
+for lib in ssl crypto; do ln -s /usr/local/opt/openssl{@1.0,}/lib/lib${lib}.1.0.0.dylib; done
+rvm reinstall $(travis_internal_ruby) --disable-binary
+for lib in ssl crypto; do rm /usr/local/opt/openssl/lib/lib${lib}.1.0.0.dylib; done

From 81024f3c066675b0a1c85c0ce588a5707e384531 Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sat, 14 Mar 2020 19:40:27 +0000
Subject: [PATCH 13/28] Upgrade to xcode 9.2 (still OSX 10.12)

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

diff --git a/.travis.yml b/.travis.yml
index 13e3617..cfcf6d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ jobs:
   include:
     - language: objective-c
       os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.2
     - language: minimal
       dist: xenial
       os: linux

From 2dfddda85f4066e5659587f3da89b9421696b8ed Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sat, 14 Mar 2020 23:41:04 +0000
Subject: [PATCH 14/28] Try installing python via Travis homebrew addon

---
 .travis.yml             | 5 +++++
 travis/macos-install.sh | 3 ---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cfcf6d6..59609ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,11 @@ jobs:
     - language: objective-c
       os: osx
       osx_image: xcode9.2
+      addons:
+        homebrew:
+          packages:
+          - python
+          update: true
     - language: minimal
       dist: xenial
       os: linux
diff --git a/travis/macos-install.sh b/travis/macos-install.sh
index 2da30ef..f7b55ac 100755
--- a/travis/macos-install.sh
+++ b/travis/macos-install.sh
@@ -2,9 +2,6 @@
 
 set -ex
 
-export HOMEBREW_NO_INSTALL_CLEANUP=1
-brew update
-brew upgrade python
 which python3
 python3 --version
 which pip3

From d297c7af776b43352edcaf9ed6856e0ce8f4b96d Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sun, 15 Mar 2020 00:00:01 +0000
Subject: [PATCH 15/28] Pull install back into scripting

---
 .travis.yml             | 5 -----
 travis/macos-install.sh | 9 +++++++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 59609ea..cfcf6d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,11 +7,6 @@ jobs:
     - language: objective-c
       os: osx
       osx_image: xcode9.2
-      addons:
-        homebrew:
-          packages:
-          - python
-          update: true
     - language: minimal
       dist: xenial
       os: linux
diff --git a/travis/macos-install.sh b/travis/macos-install.sh
index f7b55ac..8d358c4 100755
--- a/travis/macos-install.sh
+++ b/travis/macos-install.sh
@@ -2,6 +2,15 @@
 
 set -ex
 
+export HOMEBREW_NO_INSTALL_CLEANUP=1
+brew update
+
+# An error occurs when upgrading Python, but appears to be benign, hence the "|| true"
+#
+# Error: undefined method `any?' for nil:NilClass
+# /usr/local/Homebrew/Library/Homebrew/cmd/upgrade.rb:227:in `depends_on'
+brew upgrade python || true
+
 which python3
 python3 --version
 which pip3

From f85741988d4a1bb91ceb84d73b4a79e97ae23931 Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sun, 15 Mar 2020 10:35:54 +0000
Subject: [PATCH 16/28] Reset back to custom tap pyside

---
 travis/macos-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/travis/macos-install.sh b/travis/macos-install.sh
index 8d358c4..d35618c 100755
--- a/travis/macos-install.sh
+++ b/travis/macos-install.sh
@@ -15,7 +15,7 @@ which python3
 python3 --version
 which pip3
 pip3 --version
-brew install pyside
+brew install albertosottile/syncplay/pyside
 python3 -c "from PySide2 import __version__; print(__version__)"
 python3 -c "from PySide2.QtCore import __version__; print(__version__)" 
 pip3 install py2app

From 1ab7c0e209fe0c98f00c39b93d698ce97dc2bdcd Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sun, 15 Mar 2020 11:53:09 +0000
Subject: [PATCH 17/28] Explicitly install Qt 5.13.1

---
 travis/macos-install.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/travis/macos-install.sh b/travis/macos-install.sh
index d35618c..c4edb10 100755
--- a/travis/macos-install.sh
+++ b/travis/macos-install.sh
@@ -15,6 +15,10 @@ which python3
 python3 --version
 which pip3
 pip3 --version
+
+# Explicitly install Qt 5.13.1 as that has both 10.12 compatibility, and a pre-built bottle 
+brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/dcc34dd3cb24cb4f7cfa0047ccdb712d7cc4c6e4/Formula/qt.rb
+
 brew install albertosottile/syncplay/pyside
 python3 -c "from PySide2 import __version__; print(__version__)"
 python3 -c "from PySide2.QtCore import __version__; print(__version__)" 

From bc7471fc20cd4d52f59f13823ea76aa7f62f4857 Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sun, 15 Mar 2020 12:02:39 +0000
Subject: [PATCH 18/28] Install a explicit particular Python version

---
 travis/macos-install.sh | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/travis/macos-install.sh b/travis/macos-install.sh
index c4edb10..7d71a92 100755
--- a/travis/macos-install.sh
+++ b/travis/macos-install.sh
@@ -3,20 +3,16 @@
 set -ex
 
 export HOMEBREW_NO_INSTALL_CLEANUP=1
-brew update
 
-# An error occurs when upgrading Python, but appears to be benign, hence the "|| true"
-#
-# Error: undefined method `any?' for nil:NilClass
-# /usr/local/Homebrew/Library/Homebrew/cmd/upgrade.rb:227:in `depends_on'
-brew upgrade python || true
+# Python 3.7.4 with 10.12 bottle
+brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/e9004bd764c9436750a50e0b428548f68fe6a38a/Formula/python.rb
 
 which python3
 python3 --version
 which pip3
 pip3 --version
 
-# Explicitly install Qt 5.13.1 as that has both 10.12 compatibility, and a pre-built bottle 
+# Explicitly install Qt 5.13.1 as that has both 10.12 compatibility, and a pre-built bottle
 brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/dcc34dd3cb24cb4f7cfa0047ccdb712d7cc4c6e4/Formula/qt.rb
 
 brew install albertosottile/syncplay/pyside

From 68ca4c1b6050b47821c51e13abee4e1e631ff503 Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sun, 15 Mar 2020 12:06:26 +0000
Subject: [PATCH 19/28] Need to explicitly upgrade Python

---
 travis/macos-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/travis/macos-install.sh b/travis/macos-install.sh
index 7d71a92..e67d879 100755
--- a/travis/macos-install.sh
+++ b/travis/macos-install.sh
@@ -5,7 +5,7 @@ set -ex
 export HOMEBREW_NO_INSTALL_CLEANUP=1
 
 # Python 3.7.4 with 10.12 bottle
-brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/e9004bd764c9436750a50e0b428548f68fe6a38a/Formula/python.rb
+brew upgrade https://raw.githubusercontent.com/Homebrew/homebrew-core/e9004bd764c9436750a50e0b428548f68fe6a38a/Formula/python.rb
 
 which python3
 python3 --version

From 749babd8f9b590144de2fbf62720e0a76d030a0e Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sun, 15 Mar 2020 12:09:32 +0000
Subject: [PATCH 20/28] Remove Qt install

---
 travis/macos-install.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/travis/macos-install.sh b/travis/macos-install.sh
index e67d879..b6a78f6 100755
--- a/travis/macos-install.sh
+++ b/travis/macos-install.sh
@@ -12,9 +12,6 @@ python3 --version
 which pip3
 pip3 --version
 
-# Explicitly install Qt 5.13.1 as that has both 10.12 compatibility, and a pre-built bottle
-brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/dcc34dd3cb24cb4f7cfa0047ccdb712d7cc4c6e4/Formula/qt.rb
-
 brew install albertosottile/syncplay/pyside
 python3 -c "from PySide2 import __version__; print(__version__)"
 python3 -c "from PySide2.QtCore import __version__; print(__version__)" 

From 1358826b2691ed429a1f95e290be43aacde6ebde Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sun, 15 Mar 2020 12:13:14 +0000
Subject: [PATCH 21/28] Upgrade Qt version after the pyside install

---
 travis/macos-install.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/travis/macos-install.sh b/travis/macos-install.sh
index b6a78f6..ec01e3d 100755
--- a/travis/macos-install.sh
+++ b/travis/macos-install.sh
@@ -13,6 +13,10 @@ which pip3
 pip3 --version
 
 brew install albertosottile/syncplay/pyside
+
+# Explicitly install Qt 5.13.1 as that has both 10.12 compatibility, and a pre-built bottle
+brew upgrade https://raw.githubusercontent.com/Homebrew/homebrew-core/dcc34dd3cb24cb4f7cfa0047ccdb712d7cc4c6e4/Formula/qt.rb
+
 python3 -c "from PySide2 import __version__; print(__version__)"
 python3 -c "from PySide2.QtCore import __version__; print(__version__)" 
 pip3 install py2app

From a3f1daee064d9b3a8f46b13fd63de052ed874f63 Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sun, 15 Mar 2020 12:17:06 +0000
Subject: [PATCH 22/28] Switch to upstream pyside

---
 travis/macos-install.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/travis/macos-install.sh b/travis/macos-install.sh
index ec01e3d..dd95f7c 100755
--- a/travis/macos-install.sh
+++ b/travis/macos-install.sh
@@ -12,10 +12,11 @@ python3 --version
 which pip3
 pip3 --version
 
-brew install albertosottile/syncplay/pyside
-
 # Explicitly install Qt 5.13.1 as that has both 10.12 compatibility, and a pre-built bottle
-brew upgrade https://raw.githubusercontent.com/Homebrew/homebrew-core/dcc34dd3cb24cb4f7cfa0047ccdb712d7cc4c6e4/Formula/qt.rb
+brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/dcc34dd3cb24cb4f7cfa0047ccdb712d7cc4c6e4/Formula/qt.rb
+
+# Pyside 5.13.0 for 10.12 bottle
+brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/99219f0923014b24f33eae624fbfe83772c35f54/Formula/pyside.rb
 
 python3 -c "from PySide2 import __version__; print(__version__)"
 python3 -c "from PySide2.QtCore import __version__; print(__version__)" 

From 7cc5b6cc6f0824d2cef02cf6d4bd32d0d1adb300 Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sun, 15 Mar 2020 12:21:59 +0000
Subject: [PATCH 23/28] Pyside needs Qt 5.13, but installs 5.9 for some reason

---
 travis/macos-install.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/travis/macos-install.sh b/travis/macos-install.sh
index dd95f7c..94ff084 100755
--- a/travis/macos-install.sh
+++ b/travis/macos-install.sh
@@ -12,12 +12,12 @@ python3 --version
 which pip3
 pip3 --version
 
-# Explicitly install Qt 5.13.1 as that has both 10.12 compatibility, and a pre-built bottle
-brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/dcc34dd3cb24cb4f7cfa0047ccdb712d7cc4c6e4/Formula/qt.rb
-
 # Pyside 5.13.0 for 10.12 bottle
 brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/99219f0923014b24f33eae624fbfe83772c35f54/Formula/pyside.rb
 
+# Explicitly upgrade Qt 5.13.1 as the pyside above needs it
+brew upgrade https://raw.githubusercontent.com/Homebrew/homebrew-core/dcc34dd3cb24cb4f7cfa0047ccdb712d7cc4c6e4/Formula/qt.rb
+
 python3 -c "from PySide2 import __version__; print(__version__)"
 python3 -c "from PySide2.QtCore import __version__; print(__version__)" 
 pip3 install py2app

From 0505cc247ef5c62130a6f67d6943a9826d025c9c Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sun, 15 Mar 2020 12:34:27 +0000
Subject: [PATCH 24/28] Upgrade openssl

---
 travis/macos-install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/travis/macos-install.sh b/travis/macos-install.sh
index 94ff084..987dbb5 100755
--- a/travis/macos-install.sh
+++ b/travis/macos-install.sh
@@ -5,6 +5,7 @@ set -ex
 export HOMEBREW_NO_INSTALL_CLEANUP=1
 
 # Python 3.7.4 with 10.12 bottle
+brew install openssl@1.1
 brew upgrade https://raw.githubusercontent.com/Homebrew/homebrew-core/e9004bd764c9436750a50e0b428548f68fe6a38a/Formula/python.rb
 
 which python3

From f53f4d3b81e2f2d57efc59214d336237086f05d7 Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sun, 15 Mar 2020 12:40:15 +0000
Subject: [PATCH 25/28] Reinstall openssl

---
 travis/macos-install.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/travis/macos-install.sh b/travis/macos-install.sh
index 987dbb5..f1a88d0 100755
--- a/travis/macos-install.sh
+++ b/travis/macos-install.sh
@@ -5,9 +5,11 @@ set -ex
 export HOMEBREW_NO_INSTALL_CLEANUP=1
 
 # Python 3.7.4 with 10.12 bottle
-brew install openssl@1.1
 brew upgrade https://raw.githubusercontent.com/Homebrew/homebrew-core/e9004bd764c9436750a50e0b428548f68fe6a38a/Formula/python.rb
 
+# Reinstall openssl to fix Python pip install issues
+brew reinstall openssl@1.1
+
 which python3
 python3 --version
 which pip3
@@ -21,6 +23,7 @@ brew upgrade https://raw.githubusercontent.com/Homebrew/homebrew-core/dcc34dd3cb
 
 python3 -c "from PySide2 import __version__; print(__version__)"
 python3 -c "from PySide2.QtCore import __version__; print(__version__)" 
+python3 -c "import ssl; print(ssl)"
 pip3 install py2app
 python3 -c "from py2app.recipes import pyside2"
 pip3 install twisted[tls] appnope requests certifi

From ff8e16976cbc3e28b2358c171e7c177b0c34fa46 Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sun, 15 Mar 2020 12:49:28 +0000
Subject: [PATCH 26/28] Reinstall openssl, then install Python

---
 travis/macos-install.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/travis/macos-install.sh b/travis/macos-install.sh
index f1a88d0..ec8b626 100755
--- a/travis/macos-install.sh
+++ b/travis/macos-install.sh
@@ -4,12 +4,12 @@ set -ex
 
 export HOMEBREW_NO_INSTALL_CLEANUP=1
 
-# Python 3.7.4 with 10.12 bottle
-brew upgrade https://raw.githubusercontent.com/Homebrew/homebrew-core/e9004bd764c9436750a50e0b428548f68fe6a38a/Formula/python.rb
-
 # Reinstall openssl to fix Python pip install issues
 brew reinstall openssl@1.1
 
+# Python 3.7.4 with 10.12 bottle
+brew upgrade https://raw.githubusercontent.com/Homebrew/homebrew-core/e9004bd764c9436750a50e0b428548f68fe6a38a/Formula/python.rb
+
 which python3
 python3 --version
 which pip3

From 135d34b37dcf614054c7d043031a2574351833fe Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sun, 15 Mar 2020 12:54:59 +0000
Subject: [PATCH 27/28] Install openssl version in line with Python version

---
 travis/macos-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/travis/macos-install.sh b/travis/macos-install.sh
index ec8b626..3d688da 100755
--- a/travis/macos-install.sh
+++ b/travis/macos-install.sh
@@ -5,7 +5,7 @@ set -ex
 export HOMEBREW_NO_INSTALL_CLEANUP=1
 
 # Reinstall openssl to fix Python pip install issues
-brew reinstall openssl@1.1
+brew upgrade https://raw.githubusercontent.com/Homebrew/homebrew-core/e9004bd764c9436750a50e0b428548f68fe6a38a/Formula/openssl@1.1.rb
 
 # Python 3.7.4 with 10.12 bottle
 brew upgrade https://raw.githubusercontent.com/Homebrew/homebrew-core/e9004bd764c9436750a50e0b428548f68fe6a38a/Formula/python.rb

From 6588d12cb7aca94e9253f104300ff9612fa492ad Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sun, 15 Mar 2020 12:59:29 +0000
Subject: [PATCH 28/28] Drop Xcode back to 8.3

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

diff --git a/.travis.yml b/.travis.yml
index cfcf6d6..13e3617 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ jobs:
   include:
     - language: objective-c
       os: osx
-      osx_image: xcode9.2
+      osx_image: xcode8.3
     - language: minimal
       dist: xenial
       os: linux