Merge 9588ba9 into 7c2c764

st4lk · Apr 10, 2019 · 60f922d · 60f922d
2 parents 7c2c764 + 9588ba9
commit 60f922d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,13 +11,21 @@ matrix:
       env: TOXENV=py35-django20
     - python: 3.5
       env: TOXENV=py35-django21
+    - python: 3.5
+      dist: xenial
+      sudo: true
+      env: TOXENV=py35-django22
 
     - python: 3.6
       env: TOXENV=py36-django111
     - python: 3.6
       env: TOXENV=py36-django20
     - python: 3.6
       env: TOXENV=py36-django21
+    - python: 3.6
+      dist: xenial
+      sudo: true
+      env: TOXENV=py36-django22
 
     - python: 3.7
       dist: xenial
@@ -27,6 +35,10 @@ matrix:
       dist: xenial
       sudo: true
       env: TOXENV=py37-django21
+    - python: 3.7
+      dist: xenial
+      sudo: true
+      env: TOXENV=py37-django22
     - python: 3.7
       dist: xenial
       sudo: true

diff --git a/tox.ini b/tox.ini
@@ -1,9 +1,9 @@
 [tox]
 envlist=
     py{27}-django{111},
-    py{35}-django{111, 20, 21},
-    py{36}-django{111, 20, 21}
-    py{37}-django{111, 20, 21}
+    py{35}-django{111, 20, 21, 22},
+    py{36}-django{111, 20, 21, 22}
+    py{37}-django{111, 20, 21, 22}
 
 [testenv]
 setenv =
@@ -24,6 +24,7 @@ deps =
     django111: Django>=1.11,<1.12
     django20: Django>=2.0,<2.1
     django21: Django>=2.1,<2.2
+    django22: Django>=2.2,<2.3
     py37-django111: coverage
     -rrequirements_test.txt
 commands =