diff --git a/.travis.yml b/.travis.yml index ac2e6f0..1a1e4f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,67 +5,22 @@ language: python matrix: include: - python: 2.7 - env: TOXENV=py27-django18-wagtail18 - - python: 2.7 - env: TOXENV=py27-django18-wagtail19 - - python: 2.7 - env: TOXENV=py27-django19-wagtail18 - - python: 2.7 - env: TOXENV=py27-django19-wagtail19 - - python: 2.7 - env: TOXENV=py27-django110-wagtail18 - - python: 2.7 - env: TOXENV=py27-django110-wagtail19 - - python: 3.4 - env: TOXENV=py34-django18-wagtail18 - - python: 3.4 - env: TOXENV=py34-django18-wagtail19 - - python: 3.4 - env: TOXENV=py34-django19-wagtail18 - - python: 3.4 - env: TOXENV=py34-django19-wagtail19 - - python: 3.4 - env: TOXENV=py34-django110-wagtail18 - - python: 3.4 - env: TOXENV=py34-django110-wagtail19 + env: TOXENV=py27-django111-wagtail110 - python: 3.5 - env: TOXENV=py35-django18-wagtail18 - - python: 3.5 - env: TOXENV=py35-django18-wagtail19 - - python: 3.5 - env: TOXENV=py35-django19-wagtail18 - - python: 3.5 - env: TOXENV=py35-django19-wagtail19 - - python: 3.5 - env: TOXENV=py35-django110-wagtail18 - - python: 3.5 - env: TOXENV=py35-django110-wagtail19 + env: TOXENV=py35-django111-wagtail110 - python: 3.6 - env: TOXENV=py36-django18-wagtail18 - - python: 3.6 - env: TOXENV=py36-django18-wagtail19 - - python: 3.6 - env: TOXENV=py36-django19-wagtail18 - - python: 3.6 - env: TOXENV=py36-django19-wagtail19 - - python: 3.6 - env: TOXENV=py36-django110-wagtail18 - - python: 3.6 - env: TOXENV=py36-django110-wagtail19 + env: TOXENV=py36-django111-wagtail110 allow_failures: - python: 3.5 env: TOXENV=lint - install: - pip install tox codecov - script: - tox - after_success: - tox -e coverage-report - codecov diff --git a/tox.ini b/tox.ini index 48900a3..6c2c6ab 100644 --- a/tox.ini +++ b/tox.ini @@ -1,15 +1,12 @@ [tox] -envlist = py{27,34,35,36}-django{18,19,110}-wagtail{18,19},lint +envlist = py{27,35,36}-django{111}-wagtail{110},lint [testenv] commands = coverage run --parallel -m pytest {posargs} extras = test deps = - django18: django>=1.8,<1.9 - django19: django>=1.9,<1.10 - django110: django>=1.10,<1.11 - wagtail18: wagtail>=1.8,<1.9 - wagtail19: wagtail>=1.9,<1.10 + django111: django>=1.11,<1.12 + wagtail110: wagtail>=1.10,<1.11 [testenv:coverage-report] basepython = python3.5