.travis.yml

@@ -1,6 +1,8 @@
 addons:
     homebrew:
         brewfile: true
+        packages:
+            - python3
         update: true
 cache:
     directories:
@@ -18,25 +20,18 @@ 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
-        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
+    - 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
 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
@@ -60,6 +55,6 @@ matrix:
 script:
     - export TIDYALL_DATA_DIR="$HOME/tidyall_d"
     - bash -x scripts/travis-ci-build
-    - if test "$TRAVIS_OS_NAME" = "osx" ; then PYTHONPATH="." python3 setup_osx.py py2app ; fi
+    - if test "$TRAVIS_OS_NAME" = "osx" ; then PYTHONPATH="`pwd`" 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

Brewfile

@@ -2,7 +2,8 @@ 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"

NEWS.asciidoc

@@ -1,7 +1,7 @@
 [[news]]
 === News
 
-* _5 March, 2020:_ There is a new stable release
+* _TODO, 2020:_ There is a new stable release
 https://sourceforge.net/projects/pysolfc/files/PySolFC/PySolFC-2.8.0/[PySolFC
 v2.8.0]. New in this release:
 ** Better kivy/Android support