diff --git a/.travis.yml b/.travis.yml index a4a4ed8b5..55db25186 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,18 +5,15 @@ matrix: fast_finish: true include: - - { python: "3.5", env: DJANGO=1.11 } - - { python: "3.5", env: DJANGO=2.0 } - { python: "3.5", env: DJANGO=2.1 } - { python: "3.5", env: DJANGO=2.2 } - - { python: "3.6", env: DJANGO=1.11 } - - { python: "3.6", env: DJANGO=2.0 } + - { python: "3.6", env: DJANGO=3.0 } - { python: "3.6", env: DJANGO=2.1 } - { python: "3.6", env: DJANGO=2.2 } - { python: "3.6", env: DJANGO=master } - - { python: "3.7", env: DJANGO=2.0 } + - { python: "3.7", env: DJANGO=3.0 } - { python: "3.7", env: DJANGO=2.1 } - { python: "3.7", env: DJANGO=2.2 } - { python: "3.7", env: DJANGO=master } @@ -35,6 +32,7 @@ matrix: allow_failures: - env: DJANGO=master + - env: DJANGO=3.0 install: - pip install tox tox-venv tox-travis diff --git a/tox.ini b/tox.ini index 699ca909c..bddceedbb 100644 --- a/tox.ini +++ b/tox.ini @@ -1,18 +1,17 @@ [tox] envlist = - {py35,py36}-django111, - {py35,py36,py37}-django20, {py35,py36,py37}-django21 {py35,py36,py37}-django22 + {py36,py37}-django30, {py36,py37}-djangomaster, base,dist,lint,docs, [travis:env] DJANGO = 1.11: django111 - 2.0: django20 2.1: django21 2.2: django22 + 3.0: django30 master: djangomaster [testenv] @@ -22,10 +21,9 @@ setenv = PYTHONDONTWRITEBYTECODE=1 PYTHONWARNINGS=once deps = - django111: Django>=1.11,<2.0 - django20: Django>=2.0,<2.1 django21: Django>=2.1,<2.2 django22: Django>=2.2,<3.0 + django30: Django>=3.0a1,<3.1 djangomaster: https://github.com/django/django/archive/master.tar.gz -rrequirements/requirements-testing.txt -rrequirements/requirements-optionals.txt