Merge d509e49 into 541faad

.travis.yml

@@ -36,14 +36,14 @@ matrix:
     - python: "3.5"
       env: TOXENV=py35-django-111
     - python: "3.5"
-      env: TOXENV=py35-django-dev
+      env: TOXENV=py35-django-main
 
     - python: "3.6"
-      env: TOXENV=py36-django-dev
+      env: TOXENV=py36-django-main
 
   allow_failures:
-    - env: TOXENV=py35-django-dev
-    - env: TOXENV=py36-django-dev
+    - env: TOXENV=py35-django-main
+    - env: TOXENV=py36-django-main
 
 install: pip install tox tox-travis coveralls wheel
 script: tox

tox.ini

@@ -2,7 +2,7 @@
 downloadcache = {distshare}
 args_are_paths = false
 envlist =
-    {py35,py36}-django-dev
+    {py35,py36}-django-main
     {py27,py34,py35}-django-111
     {py27,py34,py35}-django-{19,110}
     {py27,py34,py35}-django-18
@@ -26,8 +26,8 @@ deps =
     django-19: Django>=1.9,<1.10
     django-110: Django>=1.10,<1.11
     django-111: Django>=1.11,<1.12
-    django-dev: git+https://github.com/django/django.git#egg=Django
-    django-{18,19,110,111,dev}: pytest-django>=3.2.0
+    django-main: git+https://github.com/django/django.git#egg=Django
+    django-{18,19,110,111,main}: pytest-django>=3.2.0
     -rtests/requirements.txt
 
 [travis]
@@ -44,7 +44,7 @@ DJANGO =
   1.9: django-19
   1.10: django-110
   1.11: django-111
-  dev: django-dev
+  main: django-main
 
 [testenv:flake8]
 basepython = python3.5