Skip to content

Commit

Permalink
Merge pull request #28 from pupil-labs/travis-macos-10-13
Browse files Browse the repository at this point in the history
Bump travis macos image to 10.13
  • Loading branch information
Patrick Faion authored Apr 7, 2020
2 parents 9dd724c + 9ec9a42 commit f8c803a
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,13 @@ env_py37: &env_py37
- TOXENV=py${PY_MM}
- PATH=/c/Python${PY_MM}:/c/Python${PY_MM}/Scripts:$PATH


################################################################################
# OS JOB TEMPLATES
################################################################################

osx_base_job: &osx_base_job
os: osx
osx_image: xcode8.3
osx_image: xcode10.1
language: sh
before_install:
- brew upgrade pyenv
Expand Down Expand Up @@ -87,26 +86,25 @@ ubuntu_bionic_base_job: &ubuntu_bionic_base_job
before_script:
- pip3 install -U pip
- pip3 install tox


################################################################################
# DEFINE JOB MATRIX
################################################################################

matrix:
include:
- name: "Python 3.6.8 on OSX 10.12 (xcode8.3)"
- name: "Python 3.6.8 on OSX 10.13 (xcode10.1)"
<<: *osx_base_job
<<: *env_py36

- name: "Python 3.7.4 on OSX 10.12 (xcode8.3)"
- name: "Python 3.7.4 on OSX 10.13 (xcode10.1)"
<<: *osx_base_job
<<: *env_py37

- name: "Python 3.6.8 on Windows"
<<: *win_base_job
<<: *env_py36

- name: "Python 3.7.4 on Windows"
<<: *win_base_job
<<: *env_py37
Expand All @@ -119,13 +117,12 @@ matrix:
<<: *ubuntu_bionic_base_job
python: 3.6.8
<<: *env_py36

- name: "Python 3.7.4 on Ubuntu 18.04 (using manylinux wheel)"
<<: *ubuntu_bionic_base_job
python: 3.7.4
<<: *env_py37


################################################################################
# RUN AND DEPLOY (OS INDEPENDENT)
################################################################################
Expand Down

0 comments on commit f8c803a

Please sign in to comment.