summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Unterwaditzer <markus@unterwaditzer.net>2016-07-26 22:29:13 +0200
committerMarkus Unterwaditzer <markus@unterwaditzer.net>2016-07-26 23:02:11 +0200
commit03c27b32277558a97d3d8e7c2584d9d3e0afa3d1 (patch)
tree9a96eac020936a855ec87cf2eaf63704e0b8a02c
parent2bdd9dae62b7434c7b2383ce45fb515bdf70c3c3 (diff)
downloadatomicwrites-03c27b32277558a97d3d8e7c2584d9d3e0afa3d1.tar.gz
Fix OS X issues
-rw-r--r--.travis.yml13
1 files changed, 8 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index b347318..989c3e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,12 @@
-os:
- - linux
- - osx
-
+sudo: false
+os: linux
language: python
+matrix:
+ include:
+ - os: osx
+ language: generic
+
python:
- "2.6"
- "2.7"
@@ -12,7 +15,6 @@ python:
- "3.4"
install:
- - pip install tox
- # The OS X VM doesn't have any Python support at all
# See https://github.com/travis-ci/travis-ci/issues/2312
if [ "$TRAVIS_OS_NAME" = "osx" ]; then
@@ -21,5 +23,6 @@ install:
virtualenv -p python3 $HOME/osx-py3;
. $HOME/osx-py3/bin/activate;
fi
+ - pip install tox
script: tox