Skip to content

Commit 564b5d2

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

File tree

2 files changed

+38
-5
lines changed

2 files changed

+38
-5
lines changed

.travis.yml

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,60 @@
1-
language: python
2-
1+
language: generic # don't use python here as it breaks osx builds
2+
os:
3+
- linux
4+
- osx
5+
env: # important!
36
matrix:
47
include:
58
- python: 2.6
9+
language: python
610
env: TOXENV=python2.6
711
- python: 2.7
12+
language: python
813
env: TOXENV=python2.7
914
- python: 3.3
15+
language: python
1016
env: TOXENV=python3.3
1117
- python: 3.4
18+
language: python
1219
env: TOXENV=python3.4
1320
- python: 3.5
21+
language: python
1422
env: TOXENV=python3.5
23+
- python: 3.6
24+
language: python
25+
env: TOXENV=python3.6
1526
- python: pypy
27+
language: python
1628
env: TOXENV=pypy
1729
- python: 3.5
30+
language: python
1831
env: TOXENV=crosspython3
1932
- python: 2.7
33+
language: python
2034
env: TOXENV=crosspython2
2135
- python: 2.7
36+
language: python
2237
env: TOXENV=docs
38+
allow_failures:
39+
# Based on workaround https://github.com/travis-ci/travis-ci/issues/2312#issuecomment-289140791
40+
- os: osx
41+
language: generic
42+
env: TOXENV=python2.7
43+
before_install:
44+
- brew update
45+
- brew install python2.7
46+
- virtualenv env -p python2.7
47+
- source env/bin/activate
48+
- os: osx
49+
language: generic
50+
env: TOXENV=python3.6
51+
before_install:
52+
- brew update
53+
- brew install python3.6
54+
- virtualenv env -p python3.6
55+
- source env/bin/activate
2356

24-
install: pip install tox
57+
install: pip install --user tox
2558

2659
script: tox
2760

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)