Merge pull request #541 from claudep/test_master

Made tests pass with master again

.travis.yml

@@ -2,7 +2,7 @@ sudo: false
 language: python
 
 python:
-  - "3.6-dev"
+  - "3.6"
   - "3.5"
   - "3.4"
   - "3.3"

mptt/templatetags/mptt_admin.py

@@ -17,7 +17,10 @@
     from django.urls import NoReverseMatch
 except ImportError:  # Django < 1.10 pragma: no cover
     from django.core.urlresolvers import NoReverseMatch
-from django.utils.deprecation import RemovedInDjango20Warning
+try:
+    from django.utils.deprecation import RemovedInDjango20Warning
+except ImportError:
+    RemovedInDjango20Warning = RuntimeWarning
 from django.utils.encoding import force_text
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe

tests/myapp/models.py

@@ -117,7 +117,9 @@ class MPTTMeta:
 
 
 class UUIDNode(MPTTModel):
-    parent = models.ForeignKey('self', null=True, blank=True, related_name='children')
+    parent = models.ForeignKey(
+        'self', null=True, blank=True, related_name='children',
+        on_delete=models.CASCADE)
     uuid = models.UUIDField(primary_key=True, default=uuid4)
     name = models.CharField(max_length=50)
 
@@ -325,5 +327,7 @@ class Book(MPTTModel):
         on_delete=models.CASCADE)
 
     name = models.CharField(max_length=50)
-    fk = TreeForeignKey(Category, null=True, blank=True, related_name='books_fk')
+    fk = TreeForeignKey(
+        Category, null=True, blank=True, related_name='books_fk',
+        on_delete=models.CASCADE)
     m2m = TreeManyToManyField(Category, blank=True, related_name='books_m2m')

tests/myapp/urls.py

@@ -1,11 +1,10 @@
+import django
 from django.conf.urls import include, url
 
 from django.contrib import admin
 
 
-admin.autodiscover()
-
-
-urlpatterns = [
-    url(r'^admin/', include(admin.site.urls)),
-]
+if django.VERSION >= (1, 9):
+    urlpatterns = [url(r'^admin/', admin.site.urls)]
+else:
+    urlpatterns = [url(r'^admin/', include(admin.site.urls))]

tests/settings.py

@@ -24,14 +24,17 @@
 
 STATIC_URL = '/static/'
 SECRET_KEY = 'abc123'
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = [
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
-)
+]
+# Compatibility for Django < 1.10
+MIDDLEWARE_CLASSES = MIDDLEWARE + [
+    'django.contrib.auth.middleware.SessionAuthenticationMiddleware'
+]
 
 TEMPLATES = [
     {