Merge ce47f5c into a1ee9a9

5monkeys · Apr 3, 2019 · a6d3f5f · a6d3f5f
2 parents a1ee9a9 + ce47f5c
commit a6d3f5f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -25,6 +25,7 @@ env:
     - TOXENV=py35-django111
     - TOXENV=py35-django20
     - TOXENV=py35-django21
+    - TOXENV=py35-django22
 
 matrix:
   include:
@@ -34,6 +35,20 @@ matrix:
       env: TOXENV=py36-django20
     - python: 3.6
       env: TOXENV=py36-django21
+    - python: 3.6
+      env: TOXENV=py36-django22
+    - python: 3.7
+      env: TOXENV=py37-django111
+      dist: xenial
+    - python: 3.7
+      env: TOXENV=py37-django20
+      dist: xenial
+    - python: 3.7
+      env: TOXENV=py37-django21
+      dist: xenial
+    - python: 3.7
+      env: TOXENV=py37-django22
+      dist: xenial
     - python: 3.4  # i.e. skip installing 3.5
       env: TOXENV=lint
     - python: 3.4

diff --git a/tox.ini b/tox.ini
@@ -8,8 +8,9 @@
 
 [tox]
 envlist = py34-django{ 18, 19, 110, 111, 20 },
-          py35-django{ 18, 19, 110, 111, 20, 21 },
-          py36-django{              111, 20, 21 }
+          py35-django{ 18, 19, 110, 111, 20, 21, 22 },
+          py36-django{              111, 20, 21, 22 },
+          py37-django{              111, 20, 21, 22 }
 
 
 [testenv]
@@ -25,6 +26,7 @@ deps = django18: Django>=1.8,<1.9
        django111: Django>=1.11,<1.12
        django20: Django>=2.0b1,<2.1
        django21: Django>=2.1,<2.2
+       django22: Django>=2.2,<2.3
        coverage
        djangorestframework>=3.9.0,<4
        django-cors-headers>=2.4.0,<3