Merge remote branch 'meshy/new-test-versions'

.travis.yml

@@ -8,6 +8,7 @@ python:
   - "3.3"
   - "3.4"
   - "3.5"
+  - "3.6"
 env:
   - DJANGO="Django>=1.4,<1.5"
   - DJANGO="Django>=1.5,<1.6"
@@ -21,6 +22,21 @@ env:
 
 matrix:
   exclude:
+  - python: "3.6"
+    env: DJANGO="Django>=1.4,<1.5"
+  - python: "3.6"
+    env: DJANGO="Django>=1.5,<1.6"
+  - python: "3.6"
+    env: DJANGO="Django>=1.6,<1.7"
+  - python: "3.6"
+    env: DJANGO="Django>=1.7,<1.8"
+  - python: "3.6"
+    env: DJANGO="Django>=1.8,<1.9"
+  - python: "3.6"
+    env: DJANGO="Django>=1.9,<1.10"
+  - python: "3.6"
+    env: DJANGO="Django>=1.10,<1.11"
+
   - python: "3.5"
     env: DJANGO="Django>=1.4,<1.5"
   - python: "3.5"

polymorphic/tests/__init__.py

@@ -204,7 +204,7 @@ class MROBase2(MROBase1):
 
 
 class MROBase3(models.Model):
-    id2 = models.AutoField(primary_key=True)  # make sure 'id' field doesn't clash, detected by Django 1.11
+    base_3_id = models.AutoField(primary_key=True)   # make sure 'id' field doesn't clash, detected by Django 1.11
     objects = PolymorphicManager()
 
 

polymorphic/tests/test_orm.py

@@ -360,7 +360,11 @@ class PolymorphicTests(TestCase):
         # no pretty printing
         ModelShow1_plain.objects.create(field1='abc')
         ModelShow2_plain.objects.create(field1='abc', field2='def')
-        self.assertEqual(qrepr(ModelShow1_plain.objects.all()), '<QuerySet [<ModelShow1_plain: ModelShow1_plain object>, <ModelShow2_plain: ModelShow2_plain object>]>')
+        # repr classnames are not hardcoded in Django 1.11+
+        if django.VERSION >= (1, 11):
+            self.assertEqual(qrepr(ModelShow1_plain.objects.all()), '<PolymorphicQuerySet [<ModelShow1_plain: ModelShow1_plain object>, <ModelShow2_plain: ModelShow2_plain object>]>')
+        else:
+            self.assertEqual(qrepr(ModelShow1_plain.objects.all()), '<QuerySet [<ModelShow1_plain: ModelShow1_plain object>, <ModelShow2_plain: ModelShow2_plain object>]>')
 
     def test_extra_method(self):
         self.create_model2abcd()

tox.ini

@@ -6,6 +6,8 @@ envlist=
     py33-django{15,16,17,18},
     py34-django{15,16,17,18,19,110,111},
     py35-django{18,19,110,111}
+    py35-django{18,19,110,111},
+    py36-django{111},
     # py33-django-dev,
     docs,