Skip to content

Commit

Permalink
Make travis happy
Browse files Browse the repository at this point in the history
  • Loading branch information
mzdaniel committed May 15, 2016
1 parent 0a5a0e1 commit 3ba5649
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 12 deletions.
17 changes: 10 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
language: python

python:
- 3.5

matrix:
include:
- language: generic
os: osx
osx_image: beta-xcode6.3
- os: osx
language: generic

python:
- 3.4
before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install python3; fi

install:
- sudo bash -c 'python3.4 <(curl https://bootstrap.pypa.io/get-pip.py)'
- sudo pip3 install tox
- sudo bash -c 'python <(curl https://bootstrap.pypa.io/get-pip.py)'
- sudo pip install tox

script:
- tox
Expand Down
10 changes: 5 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = clean, flake8, py27, py34, py35, build
envlist = clean, flake8, py35, py27, py34, build
minversion = 2.3.1
skipsdist = True
skip_missing_interpreters = true
Expand All @@ -22,17 +22,17 @@ ignore = H102,E113,E121,E127,E128,E402,H202,H301,H304,H405,H803
deps = -rtests/test_requirements.txt
commands = flake8 {toxinidir}

[testenv:py27]
[testenv:py35]
deps = -rrequirements.txt
-rtests/test_requirements.txt
commands = py.test -c tests/pytest.ini {posargs}

[testenv:py34]
[testenv:py27]
deps = -rrequirements.txt
-rtests/test_requirements.txt
commands = py.test -c tests/pytest.ini {posargs}

[testenv:py35]
[testenv:py34]
deps = -rrequirements.txt
-rtests/test_requirements.txt
commands = py.test -c tests/pytest.ini {posargs}
Expand All @@ -49,7 +49,7 @@ usedevelop = True
commands =

[testenv:build]
basepython = python3.4
basepython = python3.5
recreate= True
deps = wheel==0.29.0
pex==1.1.6
Expand Down

0 comments on commit 3ba5649

Please sign in to comment.