From 848214321b82902178694b119c5a116c0a35c1e8 Mon Sep 17 00:00:00 2001 From: Yusuke Miyazaki Date: Mon, 30 Jan 2017 11:08:42 +0900 Subject: [PATCH] Introduce tox-travis --- .travis.yml | 5 ++++- tox.ini | 11 +++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 196f781..6035b37 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,12 @@ language: python python: + - 2.7 + - 3.3 + - 3.4 - 3.5 install: - pip install -U pip setuptools wheel - - pip install 'tox>=2.0.0,<3.0.0' + - pip install 'tox>=2.0.0,<3.0.0' 'tox-travis>=0.8,<1.0' script: - tox env: diff --git a/tox.ini b/tox.ini index 9464178..67492d5 100644 --- a/tox.ini +++ b/tox.ini @@ -2,6 +2,13 @@ envlist = {py27,py33,py34,pypy,pypy3}-django18, {py27,py34,py35,pypy}-django{19,110}, coverage, docs, flake8, mypy ; https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django +[travis] +python = + 2.7: py27-django{18,19,110}, coverage, docs, flake8 + 3.3: py33-django18 + 3.4: py34-django{19,110} + 3.5: py35-django{19,110}, coverage, docs, flake8, mypy + [testenv] deps = django18: Django>=1.8,<1.9 @@ -13,7 +20,6 @@ commands = passenv = CHANNELS_* TRAVIS TRAVIS_BRANCH TRAVIS_JOB_ID [testenv:coverage] -basepython = python2.7 deps = coveralls coverage @@ -25,19 +31,16 @@ commands = coveralls [testenv:docs] -basepython = python2.7 changedir = docs commands = pip install -e ..[docs] make html [testenv:flake8] -basepython = python2.7 deps = flake8 commands = flake8 channels/ [testenv:mypy] -basepython = python3.5 deps = mypy-lang commands = mypy --py2 --silent-imports -m channels