Merge ~nataliabidart/django-adminaudit:django2 into django-adminaudit:master

[Natalia Bidart]

4574410... by Natalia Bidart on 2020-09-03

Update setup.py as per latest updates.

Unmerged commits

4574410... by Natalia Bidart on 2020-09-03

Update setup.py as per latest updates.

diff --git a/.gitignore b/.gitignore
index ecfc0d8..8b71146 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 db.sqlite3
 build/
+dist/
 django_adminaudit.egg-info/
 doc/_build/*
 .coverage
@@ -7,3 +8,4 @@ coverage
 MANIFEST
 .tox
 attachements
+__pycache__/
diff --git a/adminaudit/__init__.py b/adminaudit/__init__.py
index 8af0d98..85b40e3 100644
--- a/adminaudit/__init__.py
+++ b/adminaudit/__init__.py
@@ -7,7 +7,9 @@ def audit_install():
     from django.contrib.admin import site
     from .models import AdminAuditMixin, AuditLog
 
-    for model, model_admin in site._registry.items():
+    # Directly iterating over site._registry.items() won't work, as we are
+    # changing values on the go, which cannot be done in python 3+
+    for model, model_admin in list(site._registry.items()):
         if (model is AuditLog or isinstance(model_admin, AdminAuditMixin)):
             # Do not mingle with our own model
             continue
diff --git a/adminaudit/admin.py b/adminaudit/admin.py
index a550ef7..bdb3d48 100644
--- a/adminaudit/admin.py
+++ b/adminaudit/admin.py
@@ -17,8 +17,11 @@ class AuditLogAdmin(admin.ModelAdmin):
     def has_add_permission(self, request, obj=None):
         return False
 
-    def delete_view(self, request, object_id, extra_context=None):
-        raise Http404
+    def has_change_permission(self, request, obj=None):
+        return False
+
+    def has_delete_permission(self, request, obj=None):
+        return False
 
     def change_view(self, request, object_id, extra_context=None):
         if request.method == 'POST':
@@ -46,8 +49,5 @@ class AuditLogAdmin(admin.ModelAdmin):
         return super(AuditLogAdmin, self).change_view(
             request, object_id, extra_context=extra_context)
 
-    def get_actions(self, request):
-        return []
-
 
 admin.site.register(AuditLog, AuditLogAdmin)
diff --git a/adminaudit/management/commands/adminaudit_email_report.py b/adminaudit/management/commands/adminaudit_email_report.py
index db62187..32c3133 100644
--- a/adminaudit/management/commands/adminaudit_email_report.py
+++ b/adminaudit/management/commands/adminaudit_email_report.py
@@ -4,7 +4,6 @@
 from operator import itemgetter
 
 from django.conf import settings
-from django.template import Context
 from django.template.loader import get_template
 from django.core.mail import send_mail
 
@@ -38,6 +37,6 @@ class Command(AdminAuditBaseCommand):
         for recipient in recipients:
             context['recipient'] = recipient
             self.stdout.write("Sending e-email to: %s\n" % recipient)
-            send_mail(subject, template.render(Context(context)),
+            send_mail(subject, template.render(context),
                       from_email, [recipient], fail_silently=False)
             self.stdout.write("done\n")
diff --git a/adminaudit/management/commands/adminaudit_report.py b/adminaudit/management/commands/adminaudit_report.py
index 5a216d6..bb71895 100644
--- a/adminaudit/management/commands/adminaudit_report.py
+++ b/adminaudit/management/commands/adminaudit_report.py
@@ -1,7 +1,6 @@
 # Copyright 2010-2012 Canonical Ltd.  This software is licensed under
 # the GNU Lesser General Public License version 3 (see the file LICENSE).
 
-from django.template import Context
 from django.template.loader import get_template
 
 from adminaudit.management.commands import AdminAuditBaseCommand
@@ -13,6 +12,4 @@ class Command(AdminAuditBaseCommand):
 
     def handle(self, *args, **kwargs):
         template = get_template("adminaudit/report.txt")
-        context = Context(self.context_data())
-
-        self.stdout.write(template.render(context) + '\n')
+        self.stdout.write(template.render(self.context_data()) + '\n')
diff --git a/adminaudit/migrations/0002_auto__chg_field_auditlog_username__chg_field_auditlog_representation__.py b/adminaudit/migrations/0002_auto__chg_field_auditlog_username__chg_field_auditlog_representation__.py
deleted file mode 100644
index 158b225..0000000
--- a/adminaudit/migrations/0002_auto__chg_field_auditlog_username__chg_field_auditlog_representation__.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-
-        # Changing field 'AuditLog.username'
-        db.alter_column(u'adminaudit_auditlog', 'username', self.gf('django.db.models.fields.TextField')())
-
-        # Changing field 'AuditLog.representation'
-        db.alter_column(u'adminaudit_auditlog', 'representation', self.gf('django.db.models.fields.TextField')())
-
-        # Changing field 'AuditLog.model'
-        db.alter_column(u'adminaudit_auditlog', 'model', self.gf('django.db.models.fields.TextField')())
-
-    def backwards(self, orm):
-
-        # Changing field 'AuditLog.username'
-        db.alter_column(u'adminaudit_auditlog', 'username', self.gf('django.db.models.fields.CharField')(max_length=255))
-
-        # Changing field 'AuditLog.representation'
-        db.alter_column(u'adminaudit_auditlog', 'representation', self.gf('django.db.models.fields.CharField')(max_length=255))
-
-        # Changing field 'AuditLog.model'
-        db.alter_column(u'adminaudit_auditlog', 'model', self.gf('django.db.models.fields.CharField')(max_length=255))
-
-    models = {
-        u'adminaudit.auditlog': {
-            'Meta': {'object_name': 'AuditLog'},
-            'change': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.TextField', [], {}),
-            'representation': ('django.db.models.fields.TextField', [], {}),
-            'user_id': ('django.db.models.fields.IntegerField', [], {}),
-            'username': ('django.db.models.fields.TextField', [], {}),
-            'values': ('django.db.models.fields.TextField', [], {})
-        }
-    }
-
-    complete_apps = ['adminaudit']
\ No newline at end of file
diff --git a/adminaudit/models.py b/adminaudit/models.py
index a96bcbe..bd5792c 100644
--- a/adminaudit/models.py
+++ b/adminaudit/models.py
@@ -1,14 +1,12 @@
 # Copyright 2010-2012 Canonical Ltd.  This software is licensed under
 # the GNU Lesser General Public License version 3 (see the file LICENSE).
 
+import base64
 import json
 
 import django
 
-if django.VERSION < (1, 7):
-    from django.contrib.admin.util import NestedObjects
-else:
-    from django.contrib.admin.utils import NestedObjects
+from django.contrib.admin.utils import NestedObjects
 from django.core import serializers
 from django.db import models, router
 from django.db.models.fields.files import FileField
@@ -46,7 +44,7 @@ class AuditLog(models.Model):
                     field_name = file_field.name
                     fileobj = getattr(obj, field_name)
                     if fileobj.name:
-                        content = fileobj.read().encode('base64')
+                        content = base64.b64encode(fileobj.read()).decode('utf-8')
                         json_content['files'][fileobj.name] = content
         values_pretty = json.dumps(json_content, indent=2, sort_keys=True)
         return cls.objects.create(
@@ -54,7 +52,7 @@ class AuditLog(models.Model):
             user_id=user.id,
             model=str(obj._meta),
             values=values_pretty,
-            representation=unicode(obj),
+            representation=str(obj),
             change=change,
         )
 
diff --git a/adminaudit/templates/admin/adminaudit/auditlog/change_form.html b/adminaudit/templates/admin/adminaudit/auditlog/change_form.html
index 5b6eab0..49c164e 100644
--- a/adminaudit/templates/admin/adminaudit/auditlog/change_form.html
+++ b/adminaudit/templates/admin/adminaudit/auditlog/change_form.html
@@ -3,38 +3,54 @@
 {# Copyright 2010-2012 Canonical Ltd.  This software is licensed under #}
 {# the GNU Lesser General Public License version 3 (see the file LICENSE). #}
 
-{% load i18n %}
-
-{% block title %}View audit log| {% trans 'Django site admin' %}{% endblock %}
-{% block content_title %}<h1>View audit log</h1>{% endblock %}
-
-{% block content %}
-<table>
-  <tbody>
-    <tr>
-      <th>User</th>
-      <td>{{ original.user }}</td>
-    </tr>
-    <tr>
-      <th>Model</th>
-      <td>{{ original.model }}</td>
-    </tr>
-    <tr>
-      <th>Representation:</th>
-      <td>{{ original.representation }}</td>
-    </tr>
-    <tr>
-      <th>Change</th>
-      <td>{{ original.change }}</td>
-    </tr>
-    <tr>
-      <th>Change date</th>
-      <td>{{ original.created_at }}</td>
-    </tr>
-    <tr>
-      <th>Change values</th>
-      <td>
-        <table>
+{% block field_sets %}
+<fieldset class="module aligned ">
+  <div class="form-row field-username">
+    <div>
+      <label>Username:</label>
+      <div class="readonly">{{ original.username }}</div>
+    </div>
+  </div>
+
+  <div class="form-row field-user_id">
+    <div>
+      <label>User ID:</label>
+      <div class="readonly">{{ original.user_id }}</div>
+    </div>
+  </div>
+
+  <div class="form-row field-model">
+    <div>
+      <label>Model:</label>
+      <div class="readonly">{{ original.model }}</div>
+    </div>
+  </div>
+
+  <div class="form-row field-representation">
+    <div>
+      <label>Representation:</label>
+      <div class="readonly">{{ original.representation }}</div>
+    </div>
+  </div>
+
+  <div class="form-row field-change">
+    <div>
+      <label>Change:</label>
+      <div class="readonly">{{ original.change }}</div>
+    </div>
+  </div>
+
+  <div class="form-row field-created_at">
+    <div>
+      <label>Change date:</label>
+      <div class="readonly">{{ original.created_at }}</div>
+    </div>
+  </div>
+
+  <div class="form-row field-values">
+    <div>
+        <label>Change values:</label>
+        <table class="readonly">
           <tbody>
             <tr>
               <th>New values</th>
@@ -46,8 +62,8 @@
             </tr>
           </tbody>
         </table>
-      </td>
-   </tr>
-  </tbody>
-</table>
+    </div>
+  </div>
+
+</fieldset>
 {% endblock %}
diff --git a/adminaudit/templates/admin/base_site.html b/adminaudit/templates/admin/base_site.html
deleted file mode 100644
index fa7bdd1..0000000
--- a/adminaudit/templates/admin/base_site.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% extends "admin/base.html" %}
-
-{# Copyright 2010-2012 Canonical Ltd.  This software is licensed under #}
-{# the GNU Lesser General Public License version 3 (see the file LICENSE). #}
-
-{% load i18n %}
-
-{% block title %}{{ title }} | {% trans 'Django site admin' %}{% endblock %}
-
-{% block footer %}
-{{ block.super }}
-<script type="text/javascript">
-  if (document.getElementsByClassName) {
-      var changelinks = document.getElementsByClassName("changelink");
-      for (var i = 0; i < changelinks.length; i += 1) {
-          var a = changelinks[i];
-          if (a.getAttribute("href") == "adminaudit/auditlog/") {
-              a.parentNode.removeChild(a);
-              break;
-          }
-      }
-  }
-</script>
-{% endblock %}
-
-{% block branding %}
-<h1 id="site-name">{% trans 'Django administration' %}</h1>
-{% endblock %}
-
-{% block nav-global %}{% endblock %}
diff --git a/adminaudit/tests.py b/adminaudit/tests.py
index 9b26ddd..8191388 100644
--- a/adminaudit/tests.py
+++ b/adminaudit/tests.py
@@ -1,30 +1,32 @@
 # Copyright 2010-2012 Canonical Ltd.  This software is licensed under
 # the GNU Lesser General Public License version 3 (see the file LICENSE).
 
+import base64
 import json
 import os
 
-from cStringIO import StringIO
+from io import StringIO
 from random import choice
 from string import ascii_letters
 from datetime import timedelta
+from unittest.mock import Mock, patch
 
 import django
 
 from django.test import TestCase
 from django.db.models import Model
 from django.conf import settings
+from django.contrib.admin.sites import AdminSite
 from django.core import mail
 from django.core.files import File
 from django.core.management import call_command
-from django.core.urlresolvers import reverse
 from django.contrib.admin import ModelAdmin, site
 from django.contrib.auth.models import User, Permission
+from django.urls import reverse
 from django.utils.timezone import now
 
-from mock import Mock, patch
-
 from adminaudit import audit_install
+from adminaudit.admin import AuditLogAdmin
 from adminaudit.models import AuditLog
 from adminaudit.management.commands.adminaudit_email_report import (
     Command as EmailCommand)
@@ -36,9 +38,6 @@ class BaseTestCase(TestCase):
 
     def setUp(self):
         super(BaseTestCase, self).setUp()
-        User.objects.filter(username='test').delete()
-        AuditLog.objects.all().delete()
-
         self.user = User.objects.create_superuser(
             username='test', password='12345678', email='[e-mail]')
 
@@ -58,6 +57,7 @@ class BaseTestCase(TestCase):
 
 
 class AuditLogTestCase(TestCase):
+
     def make_log_data(self, **overrides):
         data = {
             'username': 'test',
@@ -123,7 +123,7 @@ class AuditAdminEmailReportTestCase(TestCase):
         user = self.create_and_log_in_user(is_superuser=True)
 
         auditlog_id = AuditLog.create(user, user, 'create').id
-        url = '/admin/adminaudit/auditlog/{0}/'.format(auditlog_id)
+        url = '/admin/adminaudit/auditlog/{0}/change/'.format(auditlog_id)
 
         r = self.client.post(url, {
             'values': 'test',
@@ -146,14 +146,13 @@ class AuditAdminEmailReportTestCase(TestCase):
         r = self.client.post(url, {'post': 'yes'})
 
         self.assertEqual(AuditLog.objects.filter(pk=auditlog_id).count(), 1)
-        self.assertEqual(404, r.status_code)
-
-    def test_js_for_removing_change_link_from_index_page_is_present(self):
-        self.create_and_log_in_user(is_superuser=True)
-
-        r = self.client.get(reverse('admin:index'))
+        self.assertEqual(403, r.status_code)
 
-        self.assertContains(r, 'a.parentNode.removeChild(a)')
+    def test_no_add_no_delete_no_change_permissions(self):
+        auditlog_admin = AuditLogAdmin(AuditLog, AdminSite())
+        self.assertFalse(auditlog_admin.has_add_permission(object()))
+        self.assertFalse(auditlog_admin.has_change_permission(object()))
+        self.assertFalse(auditlog_admin.has_delete_permission(object()))
 
 
 class AdminIntegrationTestCase(BaseTestCase):
@@ -176,7 +175,7 @@ class AdminIntegrationTestCase(BaseTestCase):
         self.assertOneLogCreated('create')
 
     def test_changing_object_via_admin_is_saved_by_audit(self):
-        r = self.client.get('/admin/auth/user/{0}/'.format(self.user.pk))
+        r = self.client.get('/admin/auth/user/{0}/change/'.format(self.user.pk))
         data = r.context['adminform'].form.initial
         data.update({
             'first_name': "First",
@@ -186,7 +185,7 @@ class AdminIntegrationTestCase(BaseTestCase):
             'date_joined_1': data['date_joined'].strftime("%H:%M:%S"),
         })
         r = self.client.post(
-            '/admin/auth/user/{0}/'.format(self.user.pk), data)
+            '/admin/auth/user/{0}/change/'.format(self.user.pk), data)
         self.assertEqual(302, r.status_code)
         self.assertOneLogCreated('update')
 
@@ -230,7 +229,7 @@ class AuditLogAdminChangeViewTestCase(BaseTestCase):
         auditlog = AuditLog.create(self.user, self.user, 'create')
 
         r = self.client.get(
-            '/admin/adminaudit/auditlog/{0}/'.format(auditlog.pk))
+            '/admin/adminaudit/auditlog/{0}/change/'.format(auditlog.pk))
 
         self.assertContains(r, 'test')
         self.assertContains(r, 'auth.user')
@@ -242,7 +241,7 @@ class AuditLogAdminChangeViewTestCase(BaseTestCase):
         auditlog = AuditLog.create(self.user, self.user, 'update', self.user)
 
         r = self.client.get(
-            '/admin/adminaudit/auditlog/{0}/'.format(auditlog.pk))
+            '/admin/adminaudit/auditlog/{0}/change/'.format(auditlog.pk))
 
         self.assertTrue(r.context['new'])
         self.assertTrue(r.context['old'])
@@ -251,7 +250,7 @@ class AuditLogAdminChangeViewTestCase(BaseTestCase):
         auditlog = AuditLog.create(self.user, self.user, 'delete')
 
         r = self.client.get(
-            '/admin/adminaudit/auditlog/{0}/'.format(auditlog.pk))
+            '/admin/adminaudit/auditlog/{0}/change/'.format(auditlog.pk))
 
         self.assertFalse(r.context['new'])
         self.assertTrue(r.context['old'])
@@ -345,7 +344,7 @@ class AdminAuditCLIReportTestCase(TestCase):
 class FilesTestCase(BaseTestCase):
 
     def create_post_with_attachement(self):
-        with open('adminaudit/test_data/file_1.dat') as f:
+        with open('adminaudit/test_data/file_1.dat', 'rb') as f:
             p = Post.objects.create(author=self.user, title='t', body='b')
             p.attachement.save('file_1.dat', File(f))
             p.save()
@@ -355,9 +354,9 @@ class FilesTestCase(BaseTestCase):
     def test_changing_file_in_the_admin_leaves_alone_old_file(self):
         p = self.create_post_with_attachement()
 
-        with open('adminaudit/test_data/file_2.dat') as f:
+        with open('adminaudit/test_data/file_2.dat', 'rb') as f:
             response = self.client.post(
-                '/admin/example_app/post/{0}/'.format(p.pk),
+                '/admin/example_app/post/{0}/change/'.format(p.pk),
                 data={
                     'author': self.user.pk,
                     'title': "Post title",
@@ -392,8 +391,10 @@ class FilesTestCase(BaseTestCase):
         self.assertEqual('delete', latest_log.change)
 
         data = json.loads(latest_log.values)
-        content = data['files'][attachement_path].decode('base64')
-        original_content = open('adminaudit/test_data/file_1.dat').read()
+        content = base64.b64decode(data['files'][attachement_path])
+        # be sure to open (and close) the file in binary mode
+        with open('adminaudit/test_data/file_1.dat', 'rb') as f:
+            original_content = f.read()
         self.assertEqual(original_content, content)
 
 
@@ -415,4 +416,4 @@ class AuditInstallTestCase(TestCase):
                 audit_install()
                 audit_install()
 
-        mock_unregister.assert_called_once(model)
+        mock_unregister.assert_called_once_with(model)
diff --git a/demo/settings.py b/demo/settings.py
index d97a212..042123c 100644
--- a/demo/settings.py
+++ b/demo/settings.py
@@ -1,22 +1,24 @@
 """
 Django settings for demo project.
 
+Generated by 'django-admin startproject' using Django 2.2.16.
+
 For more information on this file, see
-https://docs.djangoproject.com/en/1.7/topics/settings/
+https://docs.djangoproject.com/en/2.2/topics/settings/
 
 For the full list of settings and their values, see
-https://docs.djangoproject.com/en/1.7/ref/settings/
+https://docs.djangoproject.com/en/2.2/ref/settings/
 """
 
-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
 import django
 
-BASE_DIR = os.path.dirname(os.path.dirname(__file__))
+# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 
 # Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/
+# See https://docs.djangoproject.com/en/2.2/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = 'ljq4=m7@(1#pkuyq8rza*^-526*etfuh(in8_d(g*5n=mwbod)'
@@ -24,46 +26,56 @@ SECRET_KEY = 'ljq4=m7@(1#pkuyq8rza*^-526*etfuh(in8_d(g*5n=mwbod)'
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-TEMPLATE_DEBUG = True
-
 ALLOWED_HOSTS = []
 
 
 # Application definition
 
 INSTALLED_APPS = (
+    'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'adminaudit',
-    'django.contrib.admin',
     'example_app',
 )
 
-MIDDLEWARE_CLASSES = [
+MIDDLEWARE = [
+    'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 ]
 
-if django.VERSION < (1, 7):
-    INSTALLED_APPS += ('south',)
-    MIDDLEWARE_CLASSES.remove(
-        'django.contrib.auth.middleware.SessionAuthenticationMiddleware')
-
 ROOT_URLCONF = 'demo.urls'
 
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'debug': True,
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
+
 WSGI_APPLICATION = 'demo.wsgi.application'
 
 
 # Database
-# https://docs.djangoproject.com/en/1.7/ref/settings/#databases
+# https://docs.djangoproject.com/en/2.2/ref/settings/#databases
 
 DATABASES = {
     'default': {
@@ -72,8 +84,9 @@ DATABASES = {
     }
 }
 
+
 # Internationalization
-# https://docs.djangoproject.com/en/1.7/topics/i18n/
+# https://docs.djangoproject.com/en/2.2/topics/i18n/
 
 LANGUAGE_CODE = 'en-us'
 
@@ -85,11 +98,6 @@ USE_TZ = True
 
 
 # Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/1.7/howto/static-files/
+# https://docs.djangoproject.com/en/2.2/howto/static-files/
 
 STATIC_URL = '/static/'
-
-TEMPLATE_DIRS = (
-    os.path.join(os.path.dirname(django.__file__),
-                 'contrib/admin/templates/admin'),
-)
diff --git a/demo/urls.py b/demo/urls.py
index fd96184..f1f71be 100644
--- a/demo/urls.py
+++ b/demo/urls.py
@@ -1,19 +1,30 @@
-# Copyright 2010-2012 Canonical Ltd.  This software is licensed under
+# Copyright 2010-2020 Canonical Ltd.  This software is licensed under
 # the GNU Lesser General Public License version 3 (see the file LICENSE).
 
-from django.conf.urls import patterns, include, url
+"""demo URL Configuration
+
+The `urlpatterns` list routes URLs to views. For more information please see:
+    https://docs.djangoproject.com/en/2.2/topics/http/urls/
+Examples:
+Function views
+    1. Add an import:  from my_app import views
+    2. Add a URL to urlpatterns:  path('', views.home, name='home')
+Class-based views
+    1. Add an import:  from other_app.views import Home
+    2. Add a URL to urlpatterns:  path('', Home.as_view(), name='home')
+Including another URLconf
+    1. Import the include() function: from django.urls import include, path
+    2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
+"""
+
 from django.contrib import admin
+from django.urls import path
 
 from adminaudit import audit_install
 
 admin.autodiscover()
 audit_install()
 
-urlpatterns = patterns(
-    '',
-    # Examples:
-    # url(r'^$', 'demo.views.home', name='home'),
-    # url(r'^blog/', include('blog.urls')),
-
-    url(r'^admin/', include(admin.site.urls)),
-)
+urlpatterns = [
+    path('admin/', admin.site.urls),
+]
diff --git a/demo/wsgi.py b/demo/wsgi.py
index ef48754..4e0598d 100644
--- a/demo/wsgi.py
+++ b/demo/wsgi.py
@@ -4,7 +4,7 @@ WSGI config for demo project.
 It exposes the WSGI callable as a module-level variable named ``application``.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/1.7/howto/deployment/wsgi/
+https://docs.djangoproject.com/en/2.2/howto/deployment/wsgi/
 """
 
 import os
diff --git a/django-adminaudit.recipe b/django-adminaudit.recipe
deleted file mode 100644
index d702acf..0000000
--- a/django-adminaudit.recipe
+++ /dev/null
@@ -1,2 +0,0 @@
-# bzr-builder format 0.2 deb-version {debupstream}~{revno}
-lp:django-adminaudit
diff --git a/example_app/migrations/0001_initial.py b/example_app/migrations/0001_initial.py
index 0ef2ea7..96104c0 100644
--- a/example_app/migrations/0001_initial.py
+++ b/example_app/migrations/0001_initial.py
@@ -21,8 +21,8 @@ class Migration(migrations.Migration):
                 ('attachement', models.FileField(upload_to=b'attachements')),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('updated_at', models.DateTimeField(auto_now=True)),
-                ('author', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
-                ('related', models.ForeignKey(blank=True, to='example_app.Post', null=True)),
+                ('author', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
+                ('related', models.ForeignKey(blank=True, to='example_app.Post', null=True, on_delete=models.CASCADE)),
             ],
         ),
     ]
diff --git a/example_app/models.py b/example_app/models.py
index e5babc8..a9501fe 100644
--- a/example_app/models.py
+++ b/example_app/models.py
@@ -2,14 +2,18 @@
 # the GNU Lesser General Public License version 3 (see the file LICENSE).
 
 from django.db import models
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
+
+
+User = get_user_model()
 
 
 class Post(models.Model):
-    author = models.ForeignKey(User)
+    author = models.ForeignKey(User, on_delete=models.CASCADE)
     title = models.CharField(max_length=128)
     body = models.TextField()
     attachement = models.FileField(upload_to='attachements')
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
-    related = models.ForeignKey('self', blank=True, null=True)
+    related = models.ForeignKey(
+        'self', blank=True, null=True, on_delete=models.CASCADE)
diff --git a/example_app/south_migrations/0001_initial.py b/example_app/south_migrations/0001_initial.py
deleted file mode 100644
index ec3f4d7..0000000
--- a/example_app/south_migrations/0001_initial.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# -*- coding: utf-8 -*-
-from south.utils import datetime_utils as datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding model 'Post'
-        db.create_table('example_app_post', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('author', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
-            ('title', self.gf('django.db.models.fields.CharField')(max_length=128)),
-            ('body', self.gf('django.db.models.fields.TextField')()),
-            ('attachement', self.gf('django.db.models.fields.files.FileField')(max_length=100)),
-            ('created_at', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
-            ('updated_at', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
-            ('related', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['example_app.Post'], null=True, blank=True)),
-        ))
-        db.send_create_signal('example_app', ['Post'])
-
-
-    def backwards(self, orm):
-        # Deleting model 'Post'
-        db.delete_table('example_app_post')
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'example_app.post': {
-            'Meta': {'object_name': 'Post'},
-            'attachement': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
-            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
-            'body': ('django.db.models.fields.TextField', [], {}),
-            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'related': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['example_app.Post']", 'null': 'True', 'blank': 'True'}),
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
-        }
-    }
-
-    complete_apps = ['example_app']
\ No newline at end of file
diff --git a/example_app/south_migrations/__init__.py b/example_app/south_migrations/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/example_app/south_migrations/__init__.py
+++ /dev/null
diff --git a/setup.py b/setup.py
index 2c8cbc0..c34bafb 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright 2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2016-2020 Canonical Ltd.  This software is licensed under the
 # GNU Library General Public License version 3 (see the file LICENSE).
 from setuptools import setup
 
@@ -8,16 +8,16 @@ from setuptools import setup
 setup(
     # metadata
     name='django-adminaudit',
-    version='0.5',
+    version='2.0.0',
     description="Extends Django's admin logging capabilities",
     url='https://launchpad.net/django-adminaudit',
     author='Ubuntu One Hackers',
     author_email='[e-mail]',
     license='LGPLv3',
     classifiers=[
-        'Framework :: Django',
+        'Framework :: Django :: 2.2',
         'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)',
-        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3 :: Only',
         'Topic :: Software Development :: Libraries',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
@@ -28,12 +28,10 @@ setup(
         'adminaudit.management',
         'adminaudit.management.commands',
         'adminaudit.migrations',
-        'adminaudit.south_migrations',
     ],
     package_data={
         'adminaudit': [
             'templates/admin/adminaudit/auditlog/*.html',
-            'templates/admin/*.html',
             'templates/adminaudit/*.txt',
         ],
     },
diff --git a/tox.ini b/tox.ini
index 7fdc8d9..26b0a2f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,39 +1,8 @@
 [tox]
 envlist =
-    py27-django14, py27-django15, py27-django16, py27-django17, py27-django18
+  py37, py38
 
 [testenv]
 commands = python manage.py test adminaudit
 deps =
-    mock==1.0.1
-
-[testenv:py27]
-basepython = python2.7
-
-[testenv:py27-django14]
-deps =
-    {[testenv]deps}
-    django>=1.4,<1.5
-    south==1.0
-
-[testenv:py27-django15]
-deps =
-    {[testenv]deps}
-    django>=1.5,<1.6
-    south==1.0
-
-[testenv:py27-django16]
-deps =
-    {[testenv]deps}
-    django>=1.6,<1.7
-    south==1.0
-
-[testenv:py27-django17]
-deps =
-    {[testenv]deps}
-    django>=1.7,<1.8
-
-[testenv:py27-django18]
-deps =
-    {[testenv]deps}
-    django>=1.8,<1.9.0a
+  django>=2.2,<3