Fix import NoReverseMatch

example/models.py

@@ -60,7 +60,7 @@ class Meta:
 class Author(BaseModel):
     name = models.CharField(max_length=50)
     email = models.EmailField()
-    type = models.ForeignKey(AuthorType, null=True)
+    type = models.ForeignKey(AuthorType, null=True, on_delete=models.CASCADE)
 
     def __str__(self):
         return self.name
@@ -71,7 +71,9 @@ class Meta:
 
 @python_2_unicode_compatible
 class AuthorBio(BaseModel):
-    author = models.OneToOneField(Author, related_name='bio')
+    author = models.OneToOneField(
+        Author, related_name='bio', on_delete=models.CASCADE
+    )
     body = models.TextField()
 
     def __str__(self):
@@ -83,7 +85,7 @@ class Meta:
 
 @python_2_unicode_compatible
 class Entry(BaseModel):
-    blog = models.ForeignKey(Blog)
+    blog = models.ForeignKey(Blog, on_delete=models.CASCADE)
     headline = models.CharField(max_length=255)
     body_text = models.TextField(null=True)
     pub_date = models.DateField(null=True)
@@ -103,12 +105,15 @@ class Meta:
 
 @python_2_unicode_compatible
 class Comment(BaseModel):
-    entry = models.ForeignKey(Entry, related_name='comments')
+    entry = models.ForeignKey(
+        Entry, related_name='comments', on_delete=models.CASCADE
+    )
     body = models.TextField()
     author = models.ForeignKey(
         Author,
         null=True,
-        blank=True
+        blank=True,
+        on_delete=models.CASCADE
     )
 
     def __str__(self):
@@ -133,7 +138,9 @@ class ResearchProject(Project):
 @python_2_unicode_compatible
 class Company(models.Model):
     name = models.CharField(max_length=100)
-    current_project = models.ForeignKey(Project, related_name='companies')
+    current_project = models.ForeignKey(
+        Project, related_name='companies', on_delete=models.CASCADE
+    )
     future_projects = models.ManyToManyField(Project)
 
     def __str__(self):

example/tests/integration/test_includes.py

@@ -1,5 +1,10 @@
 import pytest
-from django.core.urlresolvers import reverse
+import django
+
+if django.VERSION >= (1, 10):
+    from django.urls import reverse
+else:
+    from django.core.urlresolvers import reverse
 
 from example.tests.utils import load_json
 

example/tests/integration/test_meta.py

@@ -1,7 +1,12 @@
 from datetime import datetime
 
 import pytest
-from django.core.urlresolvers import reverse
+import django
+
+if django.VERSION >= (1, 10):
+    from django.urls import reverse
+else:
+    from django.core.urlresolvers import reverse
 
 from example.tests.utils import load_json
 

example/tests/integration/test_model_resource_name.py

@@ -1,7 +1,13 @@
 from copy import deepcopy
 
 import pytest
-from django.core.urlresolvers import reverse
+import django
+
+if django.VERSION >= (1, 10):
+    from django.urls import reverse
+else:
+    from django.core.urlresolvers import reverse
+
 from rest_framework import status
 
 from example import models, serializers, views

example/tests/integration/test_non_paginated_responses.py

@@ -1,5 +1,10 @@
 import pytest
-from django.core.urlresolvers import reverse
+import django
+
+if django.VERSION >= (1, 10):
+    from django.urls import reverse
+else:
+    from django.core.urlresolvers import reverse
 
 from rest_framework_json_api.pagination import PageNumberPagination
 

example/tests/integration/test_pagination.py

@@ -1,5 +1,10 @@
 import pytest
-from django.core.urlresolvers import reverse
+import django
+
+if django.VERSION >= (1, 10):
+    from django.urls import reverse
+else:
+    from django.core.urlresolvers import reverse
 
 from example.tests.utils import load_json
 

example/tests/integration/test_polymorphism.py

@@ -2,7 +2,12 @@
 import random
 
 import pytest
-from django.core.urlresolvers import reverse
+import django
+
+if django.VERSION >= (1, 10):
+    from django.urls import reverse
+else:
+    from django.core.urlresolvers import reverse
 
 from example.tests.utils import load_json
 

example/tests/integration/test_sparse_fieldsets.py

@@ -1,5 +1,10 @@
 import pytest
-from django.core.urlresolvers import reverse
+import django
+
+if django.VERSION >= (1, 10):
+    from django.urls import reverse
+else:
+    from django.core.urlresolvers import reverse
 
 pytestmark = pytest.mark.django_db
 

example/tests/test_format_keys.py

@@ -1,10 +1,15 @@
+import django
 from django.contrib.auth import get_user_model
-from django.core.urlresolvers import reverse
 from django.utils import encoding
 
 from example.tests import TestBase
 from example.tests.utils import load_json
 
+if django.VERSION >= (1, 10):
+    from django.urls import reverse
+else:
+    from django.core.urlresolvers import reverse
+
 
 class FormatKeysSetTests(TestBase):
     """

example/tests/test_generic_validation.py

@@ -1,4 +1,8 @@
-from django.core.urlresolvers import reverse
+import django
+if django.VERSION >= (1, 10):
+    from django.urls import reverse
+else:
+    from django.core.urlresolvers import reverse
 
 from example.tests import TestBase
 from example.tests.utils import load_json

example/tests/test_generic_viewset.py

@@ -1,5 +1,10 @@
+import django
 from django.conf import settings
-from django.core.urlresolvers import reverse
+
+if django.VERSION >= (1, 10):
+    from django.urls import reverse
+else:
+    from django.core.urlresolvers import reverse
 
 from example.tests import TestBase
 from example.tests.utils import load_json

example/tests/test_model_viewsets.py

@@ -1,9 +1,14 @@
 import pytest
+import django
 from django.conf import settings
 from django.contrib.auth import get_user_model
-from django.core.urlresolvers import reverse
 from django.utils import encoding
 
+if django.VERSION >= (1, 10):
+    from django.urls import reverse
+else:
+    from django.core.urlresolvers import reverse
+
 from example.tests import TestBase
 from example.tests.utils import dump_json, load_json
 

example/tests/test_multiple_id_mixin.py

@@ -1,8 +1,13 @@
 import json
 
-from django.core.urlresolvers import reverse
+import django
 from django.utils import encoding
 
+if django.VERSION >= (1, 10):
+    from django.urls import reverse
+else:
+    from django.core.urlresolvers import reverse
+
 from example.tests import TestBase
 
 

example/tests/test_serializers.py

@@ -1,8 +1,13 @@
 import pytest
-from django.core.urlresolvers import reverse
+import django
 from django.test import TestCase
 from django.utils import timezone
 
+if django.VERSION >= (1, 10):
+    from django.urls import reverse
+else:
+    from django.core.urlresolvers import reverse
+
 from rest_framework_json_api.serializers import ResourceIdentifierObjectSerializer
 from rest_framework_json_api.utils import format_resource_type
 

example/tests/test_sideload_resources.py

@@ -3,9 +3,14 @@
 """
 import json
 
-from django.core.urlresolvers import reverse
+import django
 from django.utils import encoding
 
+if django.VERSION >= (1, 10):
+    from django.urls import reverse
+else:
+    from django.core.urlresolvers import reverse
+
 from example.tests import TestBase
 
 

example/tests/test_views.py

@@ -1,10 +1,15 @@
 import json
 
+import django
 from django.test import RequestFactory
 from django.utils import timezone
-from rest_framework.reverse import reverse
-from rest_framework.test import APITestCase, force_authenticate
 
+if django.VERSION >= (1, 10):
+    from django.urls import reverse
+else:
+    from django.core.urlresolvers import reverse
+
+from rest_framework.test import APITestCase, force_authenticate
 from rest_framework_json_api.utils import format_resource_type
 
 from . import TestBase

rest_framework_json_api/relations.py

@@ -4,8 +4,8 @@
 
 import inflection
 import six
+import django
 from django.core.exceptions import ImproperlyConfigured
-from django.core.urlresolvers import NoReverseMatch
 from django.utils.translation import ugettext_lazy as _
 from rest_framework.fields import MISSING_ERROR_MESSAGE
 from rest_framework.relations import MANY_RELATION_KWARGS, PrimaryKeyRelatedField
@@ -21,6 +21,11 @@
     get_resource_type_from_serializer
 )
 
+if django.VERSION >= (1, 10):
+    from django.urls import NoReverseMatch
+else:
+    from django.core.urlresolvers import NoReverseMatch
+
 LINKS_PARAMS = [
     'self_link_view_name',
     'related_link_view_name',