Merge 49914cd into 3b9dad7

.travis.yml

@@ -11,6 +11,10 @@ matrix:
         - env: TOXENV=docs
           python: "2.7"
         # Supported Python / Django versions w/ SQLite
+        - env: TOXENV=py27-django-111
+          python: "2.7"
+        - env: TOXENV=py35-django-111
+          python: "3.5"
         - env: TOXENV=py27-django-110
           python: "2.7"
         - env: TOXENV=py35-django-110
@@ -24,9 +28,13 @@ matrix:
         - env: TOXENV=py34-django-18
           python: "3.4"
         # Test with PostgreSQL
-        - env: TOXENV=py27-django-19-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-110-postgres"
+        - env: TOXENV=py27-django-111-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-111-postgres"
+          python: "2.7"
+        - env: TOXENV=py35-django-111-postgres DATABASE_URL="postgres://postgres@localhost:5432/py35-django-111-postgres"
+          python: "3.5"
+        - env: TOXENV=py27-django-110-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-110-postgres"
           python: "2.7"
-        - env: TOXENV=py35-django-19-postgres DATABASE_URL="postgres://postgres@localhost:5432/py35-django-110-postgres"
+        - env: TOXENV=py35-django-110-postgres DATABASE_URL="postgres://postgres@localhost:5432/py35-django-110-postgres"
           python: "3.5"
         - env: TOXENV=py27-django-19-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-19-postgres"
           python: "2.7"
@@ -35,6 +43,10 @@ matrix:
         - env: TOXENV=py27-django-18-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-18-postgres"
           python: "2.7"
         # Test with MySQL
+        - env: TOXENV=py27-django-111-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-111-mysql"
+          python: "2.7"
+        - env: TOXENV=py35-django-111-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-111-mysql"
+          python: "3.5"
         - env: TOXENV=py27-django-110-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-110-mysql"
           python: "2.7"
         - env: TOXENV=py35-django-110-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-110-mysql"

django_nose/runner.py

@@ -89,6 +89,10 @@ class BaseRunner(DiscoverRunner):
         '--keepdb', '--reverse', '--debug-sql',
         # 1.9 arguments
         '--parallel',
+        # 1.10 arguments
+        '--tag', '--exclude-tag',
+        # 1.11 arguments
+        '--debug-mode',
     ]
 
     #

requirements.txt

@@ -3,7 +3,7 @@
 #
 
 # Latest Django
-Django==1.8.5
+Django==1.11
 
 # This project
 -e .

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{27,34,35}-django-{18,19,110,master}
+    py{27,34,35}-django-{18,19,110,111,master}
     flake8
     docs
 skip_missing_interpreters = True
@@ -16,9 +16,10 @@ deps =
     django-18: Django>=1.8,<1.9
     django-19: Django>=1.9,<1.10
     django-110: Django==1.10,<1.11
+    django-111: Django==1.11,<1.12
     django-master: https://github.com/django/django/archive/master.tar.gz
-    {py27,py34,py35}-django-{18,19,110,master}-postgres: psycopg2
-    {py27,py34,py35}-django-{18,19,110,master}-mysql: mysqlclient
+    postgres: psycopg2
+    mysql: mysqlclient
 
 [testenv:flake8]
 deps =