diff --git a/.travis.yml b/.travis.yml index f36f2cb..adb49ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,35 +1,14 @@ language: python -dist: xenial -sudo: true +dist: bionic python: - 2.7 - - 3.4 - - 3.5 - 3.6 + - 3.7 + - 3.8 env: - - DJANGO=1.8 - - DJANGO=1.9 - - DJANGO=1.10 - DJANGO=1.11 - - DJANGO=2.0 - - DJANGO=2.1 - DJANGO=2.2 -jobs: - - exclude: - - python: 2.7 - env: DJANGO=2.0 - - - python: 2.7 - env: DJANGO=2.1 - - - python: 2.7 - env: DJANGO=2.2 - - - python: 3.4 - env: DJANGO=2.1 - - - python: 3.4 - env: DJANGO=2.2 + - DJANGO=3.0 install: - pip install tox - pip install -q tox-travis diff --git a/tox.ini b/tox.ini index 0400eca..3a13a2f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,38 +1,23 @@ [tox] -envlist = py{27}-django{18,19,110,111}, - py{34,35,36}-django{18,19,110,111,20,21,22}, +envlist = py27-django111, + py{35,36,36,37,38}-django{22,30}, flake8, sphinx, readme [tox:travis] -2.7 = py27 -3.4 = py34 -3.5 = py35 -3.6 = py36, flake8, sphinx, readme +3.8 = py38, flake8, sphinx, readme [travis:env] DJANGO = - 1.8: django18 - 1.9: django19 - 1.10: django10 1.11: django111 - 2.0: django20 - 2.1: django21 2.2: django22 + 3.0: django30 [testenv] deps = coverage - django18: Django>=1.8,<1.9 - django18: django-nose>=1.4.2 - django19: Django>=1.9,<1.10 - django19: django-nose>=1.4.3 - django110: Django>=1.10,<1.11 - django110: django-nose>=1.4.4 django111: Django>=1.11,<2.0 - django111: django-nose>=1.4.5 - django20: Django>=2.0,<2.1 - django21: Django>=2.1,<2.2 django22: Django>=2.2,<3.0 + django30: Django>=3.0,<3.1 nose py27: mock commands = @@ -43,14 +28,12 @@ commands = pip freeze [testenv:flake8] -basepython = python3.5 deps = flake8 commands = flake8 demo django_downloadview tests [testenv:sphinx] -basepython = python3.5 deps = Sphinx commands = @@ -60,7 +43,6 @@ whitelist_externals = make [testenv:readme] -basepython = python3.5 deps = docutils pygments @@ -72,7 +54,6 @@ whitelist_externals = mkdir [testenv:release] -basepython = python3.6 deps = wheel zest.releaser