diff --git a/.travis.yml b/.travis.yml index 37e13f3..019a754 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,30 +7,6 @@ matrix: # Django 1.9, Wagtail 1.9 - python: 2.7 env: TOXENV=py27-django19-wagtail19 - - python: 3.5 - env: TOXENV=py35-django19-wagtail19 - - python: 3.6 - env: TOXENV=py36-django19-wagtail19 - - # Django 1.10, Wagtail 1.10 - - python: 2.7 - env: TOXENV=py27-django110-wagtail110 - - python: 3.5 - env: TOXENV=py35-django110-wagtail110 - - python: 3.6 - env: TOXENV=py36-django110-wagtail110 - - # Django 1.11, Wagtail 1.10 - - python: 2.7 - env: TOXENV=py27-django111-wagtail110 - - python: 3.5 - env: TOXENV=py35-django111-wagtail110 - - python: 3.6 - env: TOXENV=py36-django111-wagtail110 - - allow_failures: - - python: 3.5 - env: TOXENV=lint install: - pip install tox codecov diff --git a/tox.ini b/tox.ini index 634c7d4..c4ca7bf 100644 --- a/tox.ini +++ b/tox.ini @@ -1,18 +1,16 @@ [tox] -envlist = py{27,35,36}-django{19,110,111}-wagtail{19,110},lint +envlist = py{27}-django{19}-wagtail{19},lint [testenv] commands = coverage run --parallel -m pytest {posargs} extras = test deps = django19: django>=1.9,<1.10 - django110: django>=1.10<1.11 - django111: django>=1.11,<1.12 wagtail19: wagtail>=1.9,<1.10 wagtail110: wagtail>=1.10,<1.11 [testenv:coverage-report] -basepython = python3.5 +basepython = python2.7 deps = coverage pip_pre = true skip_install = true @@ -22,7 +20,7 @@ commands = [testenv:lint] -basepython = python3.5 +basepython = python2.7 deps = flake8 commands = flake8 src tests setup.py