Skip to content

Commit b9cca81

Browse files
tkfstevengj
authored andcommitted
Test also with Python 3 in macOS (#602)
* Test also with Python 3 in macOS [skip appveyor] * Remove redundant before_install [skip appveyor] Python is installed via addons.apt.packages now so there is no need for explicit apt-get.
1 parent ad972ea commit b9cca81

File tree

1 file changed

+26
-6
lines changed

1 file changed

+26
-6
lines changed

.travis.yml

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
language: julia
22
os:
33
- linux
4-
- osx
54
julia:
65
- 0.6
76
- 0.7
@@ -19,11 +18,32 @@ env:
1918
- PYTHON=python3 # python 3.5
2019
- PYTHON=Conda # not actually a python version, here to test Conda.jl's python
2120
matrix:
22-
exclude:
23-
- os: osx
24-
env: PYTHON=python3 # I'm not sure how to install Python 3 on Travis OSX
25-
before_install:
26-
- test "x$TRAVIS_OS_NAME" = xosx -o "x$PYTHON" = xConda || (sudo apt-get -qq update && sudo apt-get install -y $PYTHON)
21+
include:
22+
- &test-macos-py2
23+
language: julia
24+
os: osx
25+
env: PYTHON=python
26+
julia: 0.6
27+
- &test-macos-py3
28+
<<: *test-macos-py2
29+
before_install:
30+
- brew update
31+
- brew upgrade python || echo "Ignoring errors..."
32+
- brew unlink python
33+
- brew link python
34+
env: PYTHON=python3
35+
- &test-macos-conda
36+
<<: *test-macos-py2
37+
env: PYTHON=Conda
38+
- {<<: *test-macos-py2, julia: 0.7}
39+
- {<<: *test-macos-py3, julia: 0.7}
40+
- {<<: *test-macos-conda, julia: 0.7}
41+
- {<<: *test-macos-py2, julia: nightly}
42+
- {<<: *test-macos-py3, julia: nightly}
43+
- {<<: *test-macos-conda, julia: nightly}
44+
# See:
45+
# https://github.com/pytest-dev/pytest/blob/799b72cf6f35c4c4c73797303d3f78c12a795f77/.travis.yml#L38-L52
46+
# https://github.com/pytest-dev/pytest/pull/3893
2747

2848
after_success:
2949
- julia -e 'Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())'

0 commit comments

Comments
 (0)