diff --git a/.travis.yml b/.travis.yml index b093f5d..b36c516 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,20 +7,16 @@ script: tox sudo: false env: matrix: - - TOXENV=py27-django18 - - TOXENV=py27-django19 - - TOXENV=py27-django110 + # django 1.11 - TOXENV=py27-django111 - - TOXENV=py33-django18 - - TOXENV=py34-django18 - - TOXENV=py34-django19 - - TOXENV=py34-django110 - TOXENV=py34-django111 - - TOXENV=py35-django18 - - TOXENV=py35-django19 - - TOXENV=py35-django110 - TOXENV=py35-django111 - TOXENV=py36-django111 + # django 2.0 + - TOXENV=py34-django200 + - TOXENV=py35-django200 + - TOXENV=py36-django200 + # pep8 - TOXENV=flake8 # work-around for Python 3.5 addons: diff --git a/tox.ini b/tox.ini index a142cd0..ed36f62 100644 --- a/tox.ini +++ b/tox.ini @@ -1,11 +1,9 @@ [tox] -envlist = py{27,33,34,35,36}-django{18,19,110,111} +envlist = py{27,34,35,36}-django{111,200} [testenv] deps = - django18: Django>=1.8,<1.9 - django19: Django>=1.9,<1.10 - django110: Django>=1.10,<1.11 django111: Django>=1.11,<1.12 + django200: Django>=2.0,<2.1 mock==1.3.0 moto==0.4.31 coveralls @@ -19,4 +17,4 @@ passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH [testenv:flake8] basepython = python deps = flake8 -commands = flake8 collectfast +commands = flake8 --ignore=E722 collectfast