diff options
-rw-r--r-- | .travis.yml | 37 | ||||
-rw-r--r-- | tox.ini | 4 |
2 files changed, 29 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index c6ef2609..4f67934d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,31 @@ language: python -python: - - "3.5" # Python 3.5 still needs to be installed on Travis-CI - -env: - - TOX_ENV=py27 - - TOX_ENV=py34 - - TOX_ENV=py35 - - TOX_ENV=pypy26 - - TOX_ENV=pycodestyle - - TOX_ENV=autopep8 + +matrix: + include: + - python: 3.6 + env: TOX_ENV=pycodestyle + - python: 3.6 + env: TOX_ENV=py36 + - python: 3.6 + env: TOX_ENV=autopep8 + + - python: 2.7 + env: TOX_ENV=pycodestyle + - python: 2.7 + env: TOX_ENV=py27 + + - python: 3.4 + env: TOX_ENV=py34 + + - python: 3.5 + env: TOX_ENV=py35 + + - python: 3.7-dev + env: TOX_ENV=py37 + +# This is disabled because of trouble running on travis CI. +# - python: pypy +# env: TOX_ENV=pypy services: - docker @@ -1,5 +1,5 @@ [tox] -envlist = py27,py34,py35,pypy26,pycodestyle,autopep8 +envlist = py27,py34,py35,py36,py37,pypy,pycodestyle,autopep8 [testenv] deps = @@ -25,7 +25,7 @@ commands = {[testenv]commands} {[testenv:scenario]commands} -[testenv:py34] +[testenv:py36] commands = {[testenv]commands} {[testenv:scenario]commands} |