Skip to content

Commit abdd7f3

Browse files
committed
Enabled osx targets on Travis with allow_failures
Signed-off-by: Sorin Sbarnea <[email protected]>
1 parent c1ef9e2 commit abdd7f3

File tree

2 files changed

+26
-3
lines changed

2 files changed

+26
-3
lines changed

.travis.yml

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
language: python
2-
2+
os:
3+
- linux
4+
- osx
5+
env: # important!
36
matrix:
47
include:
58
- python: 2.6
@@ -12,6 +15,8 @@ matrix:
1215
env: TOXENV=python3.4
1316
- python: 3.5
1417
env: TOXENV=python3.5
18+
- python: 3.6
19+
env: TOXENV=python3.6
1520
- python: pypy
1621
env: TOXENV=pypy
1722
- python: 3.5
@@ -20,6 +25,24 @@ matrix:
2025
env: TOXENV=crosspython2
2126
- python: 2.7
2227
env: TOXENV=docs
28+
allow_failures:
29+
# Based on workaround https://github.com/travis-ci/travis-ci/issues/2312#issuecomment-289140791
30+
- os: osx
31+
language: generic
32+
env: TOXENV=python2.7
33+
before_install:
34+
- brew update
35+
- brew install python2.7
36+
- virtualenv env -p python2.7
37+
- source env/bin/activate
38+
- os: osx
39+
language: generic
40+
env: TOXENV=python3.6
41+
before_install:
42+
- brew update
43+
- brew install python3.6
44+
- virtualenv env -p python3.6
45+
- source env/bin/activate
2346

2447
install: pip install tox
2548

tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[tox]
2-
# env names must be a valid python binary name, unless they have a
2+
# env names must be a valid python binary name, unless they have a
33
# separate configuration
44
envlist =
5-
python{2.6,2.7,3.3,3.4,3.5}, pypy{,3}, crosspython{2,3}, docs
5+
python{2.6,2.7,3.3,3.4,3.5,3.6}, pypy{,3}, crosspython{2,3}, docs
66

77
[testenv]
88
deps =

0 commit comments

Comments
 (0)