Merge branch 'release/2.5.0'

.travis.yml

@@ -1,31 +1,18 @@
 sudo: false
-language: python
-python: 2.7
-
 cache: pip
+language: python
+python: 3.6
 
 env:
+    - TOX_ENV=pypy-django11
+    - TOX_ENV=py27-django11
+    - TOX_ENV=py35-django11
+    - TOX_ENV=py35-django20
+    - TOX_ENV=py36-django11
+    - TOX_ENV=py36-django20
+    - TOX_ENV=flake8
+    - TOX_ENV=docs
     - TOX_ENV=coveralls
-    - TOX_ENV=py27-django18
-    - TOX_ENV=py27-django19
-    - TOX_ENV=py27-django110
-    - TOX_ENV=py27-django111
-    - TOX_ENV=py34-django18
-    - TOX_ENV=py34-django19
-    - TOX_ENV=py34-django110
-    - TOX_ENV=py34-django111
-    - TOX_ENV=py35-django18
-    - TOX_ENV=py35-django19
-    - TOX_ENV=py35-django110
-    - TOX_ENV=py35-django111
-    - TOX_ENV=py36-django18
-    - TOX_ENV=py36-django19
-    - TOX_ENV=py36-django110
-    - TOX_ENV=py36-django111
-    - TOX_ENV=pypy-django18
-    - TOX_ENV=pypy-django19
-    - TOX_ENV=pypy-django110
-    - TOX_ENV=pypy-django111
 
 install:
     - pip install --upgrade pip

django_utils/__about__.py

@@ -1,5 +1,5 @@
 __package_name__ = 'django-utils2'
-__version__ = '2.4.0'
+__version__ = '2.5.0'
 __author__ = 'Rick van Hattem'
 __author_email__ = 'Rick.van.Hattem@Fawo.nl'
 __description__ = (

django_utils/view_decorators.py

@@ -5,7 +5,7 @@
 from django.contrib.auth import decorators
 from django.core import serializers
 from django.db import models
-from django.core import urlresolvers
+from django import urls
 
 
 class ViewError(Exception):
@@ -26,21 +26,21 @@ def json_default_handler(obj):
 
 def redirect(url='./', *args, **kwargs):
     if '/' not in url or args or kwargs:
-        url = urlresolvers.reverse(url, args=args, kwargs=kwargs)
+        url = urls.reverse(url, args=args, kwargs=kwargs)
     return http.HttpResponseRedirect(url)
 
 
 def permanent_redirect(url, *args, **kwargs):
     if '/' not in url or args or kwargs:
-        url = urlresolvers.reverse(url, args=args, kwargs=kwargs)
+        url = urls.reverse(url, args=args, kwargs=kwargs)
     return http.HttpResponsePermanentRedirect(url)
 
 
 REQUEST_PROPERTIES = {
     'redirect': redirect,
     'permanent_redirect': permanent_redirect,
     'not_found': http.HttpResponseNotFound,
-    'reverse': urlresolvers.reverse,
+    'reverse': urls.reverse,
 }
 
 

django_utils/views.py

@@ -3,12 +3,12 @@
 
 
 @view_decorators.env(response_class=http.HttpResponseForbidden)
-def error_403(request):
+def error_403(request, exception):
     pass
 
 
 @view_decorators.env(response_class=http.HttpResponseNotFound)
-def error_404(request):
+def error_404(request, exception):
     pass
 
 

setup.py

@@ -49,7 +49,7 @@ def run_tests(self):
             'docs': [
                 'django',
                 'mock',
-                'sphinx>=1.5.0',
+                'sphinx>=1.7.2',
             ],
             'tests': [
                 'sphinx',

tests/test_app/models.py

@@ -11,4 +11,4 @@ class Eggs(Spam):
 
 
 class RecursionTest(models.Model):
-    parent = models.ForeignKey(Spam)
+    parent = models.ForeignKey(Spam, on_delete=models.CASCADE)

tests/test_fields.py

@@ -11,7 +11,7 @@ class Meta:
 
 class B(models.Model):
     some_attribute = models.CharField(max_length=100, blank=True, null=True)
-    parent = models.ForeignKey(A)
+    parent = models.ForeignKey(A, on_delete=models.CASCADE)
 
     # By default the fieldname is assumed to be `get_<field_name>`
     get_some_attribute = fields.RecursiveField()

tests/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import include, url
+from django.conf import urls
 from django.contrib import admin
 from django_utils import views
 
@@ -7,9 +7,9 @@
 admin.autodiscover()
 
 urlpatterns = [
-    url(r'^admin/', include(admin.site.urls)),
-    url(r'^error_403', test_views.error_403),
-    url(r'^error_500', test_views.error_500),
+    urls.url(r'^admin/', admin.site.urls),
+    urls.url(r'^error_403', test_views.error_403),
+    urls.url(r'^error_500', test_views.error_500),
 ]
 
 handler403 = views.error_403

tox.ini

@@ -1,10 +1,8 @@
 [tox]
 envlist = 
-    py27-django{18,19,110,111},
-    py34-django{18,19,110,111},
-    py35-django{18,19,110,111},
-    py36-django{18,19,110,111},
-    pypy-django{18,19,110,111}
+    py{py,27}-django11,
+    py35-django{11,20},
+    py36-django{11,20},
     flake8,
     docs
 
@@ -13,29 +11,23 @@ usedevelop = True
 
 [testenv]
 deps =
-    django18: Django>=1.8,<1.9
-    django19: Django>=1.9,<1.10
-    django110: Django>=1.10,<1.11
-    django111: Django>=1.11,<1.12
+    django11: Django<2
+    django20: Django>=2.0,<2.1
     -r{toxinidir}/tests/requirements.txt
 
 envlist = 
-    py27-django{18,19,110,111},
-    py34-django{18,19,110,111},
-    py35-django{18,19,110,111},
-    py36-django{18,19,110,111},
-    pypy-django{18,19,110,111}
+    py{py,27}-django11,
+    py35-django{11,20},
+    py36-django{11,20},
 
 commands =
     python setup.py test
 
 [testenv:flake8]
-basepython = python2.7
 deps = flake8
 commands = flake8 --ignore=W391 django_utils {posargs}
 
 [testenv:docs]
-basepython = python2.7
 whitelist_externals =
     rm
     cd