From fb8d69b1c8a9c3a5b1d4c8a2a62f587f9dced001 Mon Sep 17 00:00:00 2001
From: Juhani Numminen <juhaninumminen0@gmail.com>
Date: Tue, 3 Mar 2020 09:02:34 +0200
Subject: [PATCH] travis osx: Install python3 from python.org & build Pillow
 from source

Unlike python of Homebrew, the python.org version comes bundled with
a recent Tk that is much less buggy than macOS stock Tk.

py2app does not seem to work with Pillow's pypi wheels.
---
 .travis.yml | 25 +++++++++++++++----------
 Brewfile    |  3 +--
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a4f791b8..c1985e5b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,6 @@
 addons:
     homebrew:
         brewfile: true
-        packages:
-            - python3
         update: true
 cache:
     directories:
@@ -20,18 +18,25 @@ deploy:
     skip_cleanup: true
 dist: bionic
 before_install:
-    - if test "$TRAVIS_OS_NAME" = "osx" ; then wget --content-disposition https://sourceforge.net/projects/pysolfc/files/PySolFC-Cardsets/minimal/PySolFC-Cardsets--Minimal-2.0.tar.xz/download && tar xJf PySolFC-Cardsets--Minimal-2.0.tar.xz && mv PySolFC-Cardsets--Minimal-2.0/cardset-* data ; fi
+    - if test "$TRAVIS_OS_NAME" = "osx" ; then
+        wget --content-disposition https://sourceforge.net/projects/pysolfc/files/PySolFC-Cardsets/minimal/PySolFC-Cardsets--Minimal-2.0.tar.xz/download &&
+        tar xJf PySolFC-Cardsets--Minimal-2.0.tar.xz &&
+        mv PySolFC-Cardsets--Minimal-2.0/cardset-* data ;
+        fi
+    - if test "$TRAVIS_OS_NAME" = "osx" ; then
+        PYVER=3.8.2 &&
+        PYVER_SHORT=3.8 &&
+        wget -O python.pkg "https://www.python.org/ftp/python/${PYVER}/python-${PYVER}-macosx10.9.pkg" &&
+        sudo installer -pkg python.pkg -target / &&
+        export PATH="/Library/Frameworks/Python.framework/Versions/${PYVER_SHORT}/bin:${PATH}" ;
+        fi
 install:
     # Tests are failing for them sometimes
     - sudo cpanm --notest Capture::Tiny IPC::System::Simple
     - sudo cpanm Code::TidyAll::Plugin::Flake8 Perl::Tidy Test::Code::TidyAll Test::Differences Test::TrailingSpace
 
-    # Taken from https://github.com/mesa3d/mesa/blob/4d57a2750485e51b34e0bc413100e4e2787a4e84/.travis.yml
-    # thanks!
-    # Set PATH for homebrew pip3 installs
-    - PYTHON_VERSION=$(python3 -V | awk '{print $2}' | cut -d. -f1-2)
-    - PATH="$HOME/Library/Python/$PYTHON_VERSION/bin:${PATH}"
     - export PY_MODS='attrs configobj pycotap pysol-cards random2 setuptools six'
+    - if test "$TRAVIS_OS_NAME" = "osx" ; then export PY_MODS="--no-binary=Pillow Pillow $PY_MODS" ; fi
     - sudo pip3 install --upgrade $PY_MODS flake8 flake8-import-order
     - sudo pip2 install --upgrade $PY_MODS
 language: generic
@@ -55,6 +60,6 @@ matrix:
 script:
     - export TIDYALL_DATA_DIR="$HOME/tidyall_d"
     - bash -x scripts/travis-ci-build
-    - if test "$TRAVIS_OS_NAME" = "osx" ; then PYTHONPATH="`pwd`" python3 setup_osx.py py2app ; fi
+    - if test "$TRAVIS_OS_NAME" = "osx" ; then PYTHONPATH="." python3 setup_osx.py py2app ; fi
     - if test "$TRAVIS_OS_NAME" = "osx" ; then find . -iname '*.app' ; fi
-    - if test "$TRAVIS_OS_NAME" = "osx" ; then (cd dist; tar -cvf ../PySolFC.app.tar PySolFC.app/ ; ); xz PySolFC.app.tar ; fi
+    - if test "$TRAVIS_OS_NAME" = "osx" ; then (cd dist && tar -cvf ../PySolFC.app.tar PySolFC.app/) && xz PySolFC.app.tar ; fi
diff --git a/Brewfile b/Brewfile
index eea0f304..94ce4a29 100644
--- a/Brewfile
+++ b/Brewfile
@@ -2,8 +2,7 @@ brew "perl"
 brew "cpanminus"
 brew "gettext", link: true
 brew "gnutls"
+brew "jpeg"
 brew "openssl"
-brew "tcl-tk"
 brew "python@2"
-brew "python"
 brew "pyenv-virtualenv"