Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reinstate OSX on Travis #798

Merged
merged 2 commits into from Apr 19, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 4 additions & 7 deletions .travis.yml
@@ -1,7 +1,10 @@
sudo: false
language: generic

os:
- linux
- osx
- linux
osx_image: xcode6.4

git:
depth: 200
Expand All @@ -11,7 +14,6 @@ env:
- BINSTAR_USER: menpo
matrix:
- PYTHON_VERSION: 2.7
- PYTHON_VERSION: 3.4
- PYTHON_VERSION: 3.5

install:
Expand All @@ -28,8 +30,3 @@ notifications:
on_success: :change
on_failure: :change
email: false

after_success:
- ~/miniconda/bin/conda install coveralls -y
- cp ~/miniconda/conda-bld/test-tmp_dir/.coverage ./.coverage
- ~/miniconda/bin/coveralls