Get rid of Django 2.0 DeprecationWarning (#78)

* Get rid of Django 2.0 DeprecationWarning

Add 1.11 tox env

* add missing compatibility imports and reorder for readability

Author: coagulant

django_object_actions/tests/test_admin.py

@@ -3,10 +3,14 @@
 """
 from __future__ import unicode_literals
 
-from django.core.urlresolvers import reverse
 from django.http import HttpResponse
 from mock import patch
 
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse  # < django 1.10
+
 from .tests import LoggedInTestCase
 from example_project.polls.factories import CommentFactory, PollFactory
 

django_object_actions/tests/tests.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  # < django 1.10
 from django.test import TestCase
 
 from example_project.polls.factories import UserFactory

django_object_actions/utils.py

@@ -5,14 +5,18 @@
 
 from django.conf.urls import url
 from django.contrib import messages
-from django.core.urlresolvers import reverse
 from django.db.models.query import QuerySet
 from django.http import Http404, HttpResponseRedirect
 from django.http.response import HttpResponseBase
 from django.views.generic import View
 from django.views.generic.detail import SingleObjectMixin
 from django.views.generic.list import MultipleObjectMixin
 
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse  # < django 1.10
+
 
 class BaseDjangoObjectActions(object):
     """

example_project/polls/admin.py

@@ -2,10 +2,14 @@
 
 from django.contrib import admin
 from django.contrib.admin import AdminSite
-from django.core.urlresolvers import reverse
 from django.db.models import F
 from django.http import HttpResponseRedirect
 
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse  # < django 1.10
+
 from django_object_actions import (
     DjangoObjectActions, takes_instance_or_queryset)
 

example_project/settings.py

@@ -69,6 +69,11 @@ def project_dir(*paths):
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
         'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.contrib.auth.context_processors.auth',
+            ],
+        },
     },
 ]
 

requirements.txt

@@ -1,7 +1,7 @@
 dj-database-url==0.4.1
 # Can upgrade once we lose DJANGO1.7
 django-extensions==1.6.7
-factory-boy==2.7.0
+factory-boy==2.8.1
 faker==0.7.7
 coverage==4.2
 mock==2.0.0

tox.ini

@@ -7,6 +7,7 @@ envlist =
     django18-{py27,py34,py35},
     django19-{py27,py34,py35},
     django110-{py27,py35},
+    django111-{py27,py35},
     # run one of the tests again but with coverage
     coveralls-django110-py35,
 skipsdist = True
@@ -23,6 +24,7 @@ deps =
     django18: Django<1.9
     django19: Django<1.10
     django110: Django<1.11
+    django111: Django>=1.11rc1,<2.0
 
 [testenv:coveralls-django110-py35]
 commands =