Merge 0e40971 into 7688fda

.travis.yml

@@ -15,6 +15,7 @@ python:
   - "3.3"
   - "3.4"
   - "3.5"
+  - "3.6"
   - "pypy"
   - "pypy3"
 env:
@@ -24,6 +25,8 @@ env:
   - DJANGO='Django<1.9'  # Django 1.8
   - DJANGO='Django<1.10' # Django 1.9
   - DJANGO='Django<1.11' # Django 1.10
+  - DJANGO='Django<1.12' # Django 1.11
+  - DJANGO='Django<2.1' # Django 2.0
 matrix:
   exclude:
     - python: "2.6"
@@ -34,24 +37,52 @@ matrix:
       env: DJANGO='Django<1.10'
     - python: "2.6"
       env: DJANGO='Django<1.11'
+    - python: "2.6"
+      env: DJANGO='Django<1.12'
+    - python: "2.6"
+      env: DJANGO='Django<2.1'
+    - python: "2.7"
+      env: DJANGO='Django<2.1'
     - python: "3.3"
       env: DJANGO='Django<1.10'
     - python: "3.3"
       env: DJANGO='Django<1.11'
+    - python: "3.3"
+      env: DJANGO='Django<1.12'
+    - python: "3.3"
+      env: DJANGO='Django<2.1'
     - python: "3.4"
       env: DJANGO='Django<1.6'
     - python: "3.4"
       env: DJANGO='Django<1.7'
+    - python: "3.4"
+      env: DJANGO='Django<2.1'
     - python: "3.5"
       env: DJANGO='Django<1.6'
     - python: "3.5"
       env: DJANGO='Django<1.7'
     - python: "3.5"
       env: DJANGO='Django<1.8'
-    - python: "pypy3"
+    - python: "3.6"
+      env: DJANGO='Django<1.6'
+    - python: "3.6"
+      env: DJANGO='Django<1.7'
+    - python: "3.6"
+      env: DJANGO='Django<1.8'
+    - python: "3.6"
+      env: DJANGO='Django<1.9'
+    - python: "3.6"
       env: DJANGO='Django<1.10'
-    - python: "pypy3"
+    - python: "3.6"
       env: DJANGO='Django<1.11'
+    - python: "pypy"
+      env: DJANGO='Django<2.1'
+    - python: "pypy3"
+      env: DJANGO='Django<1.6'
+    - python: "pypy3"
+      env: DJANGO='Django<1.7'
+    - python: "pypy3"
+      env: DJANGO='Django<1.8'
 install:
   - 'pip install "${DJANGO}"'
   - pip install coveralls

rules/templatetags/rules.py

@@ -4,14 +4,15 @@
 
 
 register = template.Library()
+register_tag = register.assignment_tag if hasattr(register, 'assignment_tag') else register.simple_tag
 
 
-@register.assignment_tag
+@register_tag
 def test_rule(name, obj=None, target=None):
     return default_rules.test_rule(name, obj, target)
 
 
-@register.assignment_tag
+@register_tag
 def has_perm(perm, user, obj=None):
     if not hasattr(user, 'has_perm'):  # pragma: no cover
         return False  # swapped user model that doesn't support permissions

tests/testapp/models.py

@@ -7,7 +7,7 @@
 class Book(models.Model):
     isbn = models.CharField(max_length=50, unique=True)
     title = models.CharField(max_length=100)
-    author = models.ForeignKey(settings.AUTH_USER_MODEL)
+    author = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
 
     def __str__(self):
         return self.title

tests/testapp/urls.py

@@ -8,7 +8,7 @@
 admin.autodiscover()
 
 urlpatterns = [
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
 
     # Function-based views
     url(r'^(?P<book_id>\d+)/change/$', change_book, name='change_book'),

tests/testsuite/contrib/test_admin.py

@@ -1,4 +1,7 @@
-from django.core.urlresolvers import reverse
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse
 from django.test import TestCase