Test against Django 2.2

wagtail · Apr 2, 2019 · 16b81a3 · 16b81a3
1 parent c1c6ecc
commit 16b81a3
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,24 +12,14 @@ matrix:
      python: 2.7
    - env: TOXENV=py34-dj110-sqlite
      python: 3.4
-   - env: TOXENV=py35-dj110-sqlite
-     python: 3.5
    - env: TOXENV=py27-dj111-sqlite
      python: 2.7
    - env: TOXENV=py35-dj111-sqlite
      python: 3.5
-   - env: TOXENV=py36-dj111-sqlite
-     python: 3.6
    - env: TOXENV=py34-dj20-sqlite
      python: 3.4
-   - env: TOXENV=py35-dj20-sqlite
-     python: 3.5
    - env: TOXENV=py36-dj20-sqlite
      python: 3.6
-   - env: TOXENV=py37-dj20-sqlite
-     python: 3.7
-     dist: xenial
-     sudo: true
    - env: TOXENV=py35-dj21-sqlite
      python: 3.5
    - env: TOXENV=py36-dj21-sqlite
@@ -38,28 +28,30 @@ matrix:
      python: 3.7
      dist: xenial
      sudo: true
+   - env: TOXENV=py35-dj22-sqlite
+     python: 3.5
+     dist: xenial
+     sudo: true
+   - env: TOXENV=py36-dj22-sqlite
+     python: 3.6
+     dist: xenial
+     sudo: true
+   - env: TOXENV=py37-dj22-sqlite
+     python: 3.7
+     dist: xenial
+     sudo: true
    - env: TOXENV=py27-dj110-postgres
      python: 2.7
    - env: TOXENV=py34-dj110-postgres
      python: 3.4
-   - env: TOXENV=py35-dj110-postgres
-     python: 3.5
    - env: TOXENV=py27-dj111-postgres
      python: 2.7
    - env: TOXENV=py35-dj111-postgres
      python: 3.5
-   - env: TOXENV=py36-dj111-postgres
-     python: 3.6
    - env: TOXENV=py34-dj20-postgres
      python: 3.4
-   - env: TOXENV=py35-dj20-postgres
-     python: 3.5
    - env: TOXENV=py36-dj20-postgres
      python: 3.6
-   - env: TOXENV=py37-dj20-postgres
-     python: 3.7
-     dist: xenial
-     sudo: true
    - env: TOXENV=py35-dj21-postgres
      python: 3.5
    - env: TOXENV=py36-dj21-postgres
@@ -68,6 +60,14 @@ matrix:
      python: 3.7
      dist: xenial
      sudo: true
+   - env: TOXENV=py35-dj22-postgres
+     python: 3.5
+   - env: TOXENV=py36-dj22-postgres
+     python: 3.6
+   - env: TOXENV=py37-dj22-postgres
+     python: 3.7
+     dist: xenial
+     sudo: true
 
 install:
   - pip install tox

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -3,6 +3,7 @@ Changelog
 
 4.4 (xx.xx.xxxx)
 ~~~~~~~~~~~~~~~~
+* Django 2.2 compatibility
 * Support nested child relationships in ClusterForm (Sam Costigan)
 
 4.3 (15.11.2018)

diff --git a/tox.ini b/tox.ini
@@ -23,6 +23,7 @@ deps =
     dj111: Django>=1.11,<2.0
     dj20: Django>=2.0,<2.1
     dj21: Django>=2.1,<2.2
+    dj22: Django>=2.2,<2.3
     postgres: psycopg2>=2.6
 
 setenv =