diff --git a/.travis.yml b/.travis.yml index 4fe8630bc..28853b188 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,33 +6,10 @@ matrix: fast_finish: true include: - python: 2.7 - env: TOXENV=py27-dj111 - python: 3.4 - env: TOXENV=py34-dj111 - python: 3.5 - env: TOXENV=py35-dj111 - python: 3.6 - env: TOXENV=py36-dj111 - - python: 3.4 - env: TOXENV=py34-dj20 - - python: 3.5 - env: TOXENV=py35-dj20 - - python: 3.6 - env: TOXENV=py36-dj20 - - python: 3.7 - env: TOXENV=py37-dj20 - - python: 3.5 - env: TOXENV=py35-dj21 - - python: 3.6 - env: TOXENV=py36-dj21 - - python: 3.7 - env: TOXENV=py37-dj21 - - python: 3.5 - env: TOXENV=py35-djmaster - - python: 3.6 - env: TOXENV=py36-djmaster - python: 3.7 - env: TOXENV=py37-djmaster - python: 3.7 env: TOXENV=postgresql addons: @@ -46,13 +23,9 @@ matrix: env: TOXENV=style - python: 3.7 env: TOXENV=readme - allow_failures: - - env: TOXENV=py35-djmaster - - env: TOXENV=py36-djmaster - - env: TOXENV=py37-djmaster install: - - pip install tox codecov + - pip install tox tox-travis codecov script: - tox -v after_success: diff --git a/tox.ini b/tox.ini index d14b7f71a..aee5df5c9 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py{27,34,35,36}-dj111 + py{27,34,35,36,37}-dj111 py{34,35,36,37}-dj20 py{35,36,37}-dj21 py{35,36,37}-djmaster