From 30b233befc9b7796bf94fa194b14b6e373049a82 Mon Sep 17 00:00:00 2001 From: Min RK Date: Wed, 12 Dec 2018 11:02:30 +0100 Subject: [PATCH 1/4] test on macOS --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index a953300..9b0f4ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ python: - 3.4 - 3.5 - 3.6 + - 3.7 - nightly branches: only: @@ -15,3 +16,9 @@ script: - py.test --cov wurlitzer test.py after_success: - codecov +matrix: + include: + - os: osx + python: 3.6 + - os: osx + python: 2.7 From 0413b778be35b2a94519ba8e9a18c98a56c637e1 Mon Sep 17 00:00:00 2001 From: Min RK Date: Wed, 12 Dec 2018 11:06:35 +0100 Subject: [PATCH 2/4] py37 requires xenial --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9b0f4ad..88b0f58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ python: - 3.4 - 3.5 - 3.6 - - 3.7 - nightly branches: only: @@ -22,3 +21,6 @@ matrix: python: 3.6 - os: osx python: 2.7 + - os: linux + dist: xenial + python: 3.7 From 7ef3e29f268322fb92109082d147ec057cc0be7d Mon Sep 17 00:00:00 2001 From: Min RK Date: Wed, 12 Dec 2018 11:12:48 +0100 Subject: [PATCH 3/4] create virtualenv for mac builds --- .travis.yml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 88b0f58..9f134ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,18 +9,33 @@ python: branches: only: - master +before_install: + - | + # setup mac virtualenv + if [[ $(uname) == "Darwin" ]]; then + brew install python + python3 -m pip install virtualenv + virtualenv -p $(which python$PY) ./test-env + source ./test-env/bin/activate + fi install: - pip install . -r dev-requirements.txt + - pip freeze script: - py.test --cov wurlitzer test.py after_success: - codecov +env: + global: + - HOMEBREW_NO_AUTO_UPDATE=1 matrix: include: - os: osx - python: 3.6 + env: + - PY=2 - os: osx - python: 2.7 + env: + - PY=3 - os: linux dist: xenial python: 3.7 From 89a9de4aa65a50d520657695e5150b124eefe135 Mon Sep 17 00:00:00 2001 From: Min RK Date: Wed, 12 Dec 2018 13:13:18 +0100 Subject: [PATCH 4/4] macos needs language: generic --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9f134ce..3cf923a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,9 +31,11 @@ env: matrix: include: - os: osx + language: generic env: - PY=2 - os: osx + language: generic env: - PY=3 - os: linux