From 564b5d29fdb7f35e88dd55ffbb645891f1ebb003 Mon Sep 17 00:00:00 2001
From: Sorin Sbarnea <ssbarnea@redhat.com>
Date: Tue, 4 Apr 2017 10:40:45 +0100
Subject: [PATCH] Enabled osx targets on Travis with allow_failures
Signed-off-by: Sorin Sbarnea <ssbarnea@redhat.com>
---
.travis.yml | 39 ++++++++++++++++++++++++++++++++++++---
tox.ini | 4 ++--
2 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 676e5b5dc..77d6b9f23 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,27 +1,60 @@
-language: python
-
+language: generic # don't use python here as it breaks osx builds
+os:
+ - linux
+ - osx
+env: # important!
matrix:
include:
- python: 2.6
+ language: python
env: TOXENV=python2.6
- python: 2.7
+ language: python
env: TOXENV=python2.7
- python: 3.3
+ language: python
env: TOXENV=python3.3
- python: 3.4
+ language: python
env: TOXENV=python3.4
- python: 3.5
+ language: python
env: TOXENV=python3.5
+ - python: 3.6
+ language: python
+ env: TOXENV=python3.6
- python: pypy
+ language: python
env: TOXENV=pypy
- python: 3.5
+ language: python
env: TOXENV=crosspython3
- python: 2.7
+ language: python
env: TOXENV=crosspython2
- python: 2.7
+ language: python
env: TOXENV=docs
+ allow_failures:
+ # Based on workaround https://github.com/travis-ci/travis-ci/issues/2312#issuecomment-289140791
+ - os: osx
+ language: generic
+ env: TOXENV=python2.7
+ before_install:
+ - brew update
+ - brew install python2.7
+ - virtualenv env -p python2.7
+ - source env/bin/activate
+ - os: osx
+ language: generic
+ env: TOXENV=python3.6
+ before_install:
+ - brew update
+ - brew install python3.6
+ - virtualenv env -p python3.6
+ - source env/bin/activate
-install: pip install tox
+install: pip install --user tox
script: tox
diff --git a/tox.ini b/tox.ini
index bc61f8cab..80caf9603 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,8 @@
[tox]
-# env names must be a valid python binary name, unless they have a
+# env names must be a valid python binary name, unless they have a
# separate configuration
envlist =
- python{2.6,2.7,3.3,3.4,3.5}, pypy{,3}, crosspython{2,3}, docs
+ python{2.6,2.7,3.3,3.4,3.5,3.6}, pypy{,3}, crosspython{2,3}, docs
[testenv]
deps =