Merge pull request #45 from ActivityWatch/dev/macos-package-fix

[macos] packaging fix

.travis.yml

@@ -52,7 +52,6 @@ matrix:
  allow_failures:
  - python: 3.6
  - python: nightly
- - os: osx
 
 before_install:
  - if [[ "$TRAVIS_OS_NAME" == "osx" ]];
@@ -62,9 +61,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:

scripts/setup_venv_osx.sh

@@ -1,7 +1,18 @@
 #!/bin/bash
 
-brew update;
-brew install python3;
+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 virtualenv;
 virtualenv venv -p python3;