Skip to content

Commit 4f34ee5

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

File tree

2 files changed

+36
-4
lines changed

2 files changed

+36
-4
lines changed

.travis.yml

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,57 @@
1-
language: python
2-
1+
os:
2+
- linux
3+
- osx
4+
env: # important!
35
matrix:
46
include:
57
- python: 2.6
8+
language: python
69
env: TOXENV=python2.6
710
- python: 2.7
11+
language: python
812
env: TOXENV=python2.7
913
- python: 3.3
14+
language: python
1015
env: TOXENV=python3.3
1116
- python: 3.4
17+
language: python
1218
env: TOXENV=python3.4
1319
- python: 3.5
20+
language: python
1421
env: TOXENV=python3.5
22+
- python: 3.6
23+
language: python
24+
env: TOXENV=python3.6
1525
- python: pypy
26+
language: python
1627
env: TOXENV=pypy
1728
- python: 3.5
29+
language: python
1830
env: TOXENV=crosspython3
1931
- python: 2.7
32+
language: python
2033
env: TOXENV=crosspython2
2134
- python: 2.7
35+
language: python
2236
env: TOXENV=docs
37+
allow_failures:
38+
# Based on workaround https://github.com/travis-ci/travis-ci/issues/2312#issuecomment-289140791
39+
- os: osx
40+
language: generic
41+
env: TOXENV=python2.7
42+
before_install:
43+
- brew update
44+
- brew install python2.7
45+
- virtualenv env -p python2.7
46+
- source env/bin/activate
47+
- os: osx
48+
language: generic
49+
env: TOXENV=python3.6
50+
before_install:
51+
- brew update
52+
- brew install python3.6
53+
- virtualenv env -p python3.6
54+
- source env/bin/activate
2355

2456
install: pip install tox
2557

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)