Test against Django master and stable/2.2.x

wagtail · Aug 6, 2019 · a246e28 · a246e28
1 parent a2c5306
commit a246e28
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -30,6 +30,14 @@ matrix:
      python: 3.6
    - env: TOXENV=py37-dj22-postgres-taggit1
      python: 3.7
+   - env: TOXENV=py37-dj22stable-postgres-taggit1
+     python: 3.7
+   - env: TOXENV=py37-djmaster-postgres-taggit1
+     python: 3.7
+  allow_failures:
+    # allow failures against Django git master and 2.2.x stable
+    - env: TOXENV=py37-dj22stable-postgres-taggit1
+    - env: TOXENV=py37-djmaster-postgres-taggit1
 
 install:
   - pip install tox

diff --git a/tox.ini b/tox.ini
@@ -19,6 +19,8 @@ deps =
     dj20: Django>=2.0,<2.1
     dj21: Django>=2.1,<2.2
     dj22: Django>=2.2,<2.3
+    dj22stable: git+https://github.com/django/django.git@stable/2.2.x#egg=Django
+    djmaster: git+https://github.com/django/django.git@master#egg=Django
     postgres: psycopg2>=2.6
 
 setenv =