diff --git a/.travis.yml b/.travis.yml index c2cb1952..e526e21a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,16 +4,16 @@ cache: pip # Favor explicit over implicit and use an explicit build matrix. matrix: allow_failures: - - env: TOXENV=py34-df20-django20-drfmaster - - env: TOXENV=py35-df20-django20-drfmaster - - env: TOXENV=py36-df20-django20-drfmaster - - env: TOXENV=py37-df20-django20-drfmaster - - env: TOXENV=py35-df20-django21-drfmaster - - env: TOXENV=py36-df20-django21-drfmaster - - env: TOXENV=py37-df20-django21-drfmaster - - env: TOXENV=py35-df20-django22-drfmaster - - env: TOXENV=py36-df20-django22-drfmaster - - env: TOXENV=py37-df20-django22-drfmaster + - env: TOXENV=py34-df21-django20-drfmaster + - env: TOXENV=py35-df21-django20-drfmaster + - env: TOXENV=py36-df21-django20-drfmaster + - env: TOXENV=py37-df21-django20-drfmaster + - env: TOXENV=py35-df21-django21-drfmaster + - env: TOXENV=py36-df21-django21-drfmaster + - env: TOXENV=py37-df21-django21-drfmaster + - env: TOXENV=py35-df21-django22-drfmaster + - env: TOXENV=py36-df21-django22-drfmaster + - env: TOXENV=py37-df21-django22-drfmaster include: - python: 3.6 @@ -29,94 +29,94 @@ matrix: env: TOXENV=py27-df11-django111-drf39 - python: 3.4 - env: TOXENV=py34-df20-django111-drf36 + env: TOXENV=py34-df21-django111-drf36 - python: 3.4 - env: TOXENV=py34-df20-django111-drf37 + env: TOXENV=py34-df21-django111-drf37 - python: 3.4 - env: TOXENV=py34-df20-django111-drf38 + env: TOXENV=py34-df21-django111-drf38 - python: 3.4 - env: TOXENV=py34-df20-django20-drf37 + env: TOXENV=py34-df21-django20-drf37 - python: 3.4 - env: TOXENV=py34-df20-django20-drf38 + env: TOXENV=py34-df21-django20-drf38 - python: 3.4 - env: TOXENV=py34-df20-django20-drf39 + env: TOXENV=py34-df21-django20-drf39 - python: 3.4 - env: TOXENV=py34-df20-django20-drfmaster + env: TOXENV=py34-df21-django20-drfmaster - python: 3.5 - env: TOXENV=py35-df20-django111-drf36 + env: TOXENV=py35-df21-django111-drf36 - python: 3.5 - env: TOXENV=py35-df20-django111-drf37 + env: TOXENV=py35-df21-django111-drf37 - python: 3.5 - env: TOXENV=py35-df20-django111-drf38 + env: TOXENV=py35-df21-django111-drf38 - python: 3.5 - env: TOXENV=py35-df20-django20-drf37 + env: TOXENV=py35-df21-django20-drf37 - python: 3.5 - env: TOXENV=py35-df20-django20-drf38 + env: TOXENV=py35-df21-django20-drf38 - python: 3.5 - env: TOXENV=py35-df20-django20-drf39 + env: TOXENV=py35-df21-django20-drf39 - python: 3.5 - env: TOXENV=py35-df20-django20-drfmaster + env: TOXENV=py35-df21-django20-drfmaster - python: 3.5 - env: TOXENV=py35-df20-django21-drf39 + env: TOXENV=py35-df21-django21-drf39 - python: 3.5 - env: TOXENV=py35-df20-django21-drfmaster + env: TOXENV=py35-df21-django21-drfmaster - python: 3.5 dist: xenial - env: TOXENV=py35-df20-django22-drf39 + env: TOXENV=py35-df21-django22-drf39 - python: 3.5 dist: xenial - env: TOXENV=py35-df20-django22-drfmaster + env: TOXENV=py35-df21-django22-drfmaster - python: 3.6 - env: TOXENV=py36-df20-django111-drf36 + env: TOXENV=py36-df21-django111-drf36 - python: 3.6 - env: TOXENV=py36-df20-django111-drf37 + env: TOXENV=py36-df21-django111-drf37 - python: 3.6 - env: TOXENV=py36-df20-django111-drf38 + env: TOXENV=py36-df21-django111-drf38 - python: 3.6 - env: TOXENV=py36-df20-django20-drf37 + env: TOXENV=py36-df21-django20-drf37 - python: 3.6 - env: TOXENV=py36-df20-django20-drf38 + env: TOXENV=py36-df21-django20-drf38 - python: 3.6 - env: TOXENV=py36-df20-django20-drf39 + env: TOXENV=py36-df21-django20-drf39 - python: 3.6 - env: TOXENV=py36-df20-django20-drfmaster + env: TOXENV=py36-df21-django20-drfmaster - python: 3.6 - env: TOXENV=py36-df20-django21-drf39 + env: TOXENV=py36-df21-django21-drf39 - python: 3.6 - env: TOXENV=py36-df20-django21-drfmaster + env: TOXENV=py36-df21-django21-drfmaster - python: 3.6 dist: xenial - env: TOXENV=py36-df20-django22-drf39 + env: TOXENV=py36-df21-django22-drf39 - python: 3.6 dist: xenial - env: TOXENV=py36-df20-django22-drfmaster + env: TOXENV=py36-df21-django22-drfmaster - python: 3.7 dist: xenial sudo: required - env: TOXENV=py37-df20-django20-drf39 + env: TOXENV=py37-df21-django20-drf39 - python: 3.7 dist: xenial sudo: required - env: TOXENV=py37-df20-django20-drfmaster + env: TOXENV=py37-df21-django20-drfmaster - python: 3.7 dist: xenial sudo: required - env: TOXENV=py37-df20-django21-drf39 + env: TOXENV=py37-df21-django21-drf39 - python: 3.7 dist: xenial sudo: required - env: TOXENV=py37-df20-django21-drfmaster + env: TOXENV=py37-df21-django21-drfmaster - python: 3.7 dist: xenial sudo: required - env: TOXENV=py37-df20-django22-drf39 + env: TOXENV=py37-df21-django22-drf39 - python: 3.7 dist: xenial sudo: required - env: TOXENV=py37-df20-django22-drfmaster + env: TOXENV=py37-df21-django22-drfmaster install: - pip install tox script: diff --git a/tox.ini b/tox.ini index 2ea9bad2..c73cd6b1 100644 --- a/tox.ini +++ b/tox.ini @@ -1,11 +1,11 @@ [tox] envlist = py27-df11-django111-drf{36,37,38,39} - py{34,35,36}-df20-django111-drf{36,37,38,39,master}, - py{34,35,36}-df20-django20-drf{37,38,39,master}, - py37-df20-django20-drf{39,master}, - py{35,36,37}-df20-django21-drf{39,master}, - py{35,36,37}-df20-django22-drf{39,master}, + py{34,35,36}-df21-django111-drf{36,37,38,39,master}, + py{34,35,36}-df21-django20-drf{37,38,39,master}, + py37-df21-django20-drf{39,master}, + py{35,36,37}-df21-django21-drf{39,master}, + py{35,36,37}-df21-django22-drf{39,master}, [testenv] deps = @@ -19,7 +19,7 @@ deps = drf39: djangorestframework>=3.9.0,<3.10 drfmaster: https://github.com/encode/django-rest-framework/archive/master.zip df11: django-filter<=1.1 - df20: django-filter>=2.0 + df21: django-filter>=2.1 setenv = PYTHONPATH = {toxinidir}