Merge lp:~fo0bar/turku/turku-api-focal into lp:turku/turku-api

[Ryan Finnie]

Add compatibility for Django 2.2 (Ubuntu focal)

- reverse/reverse_lazy changed from django.core.urlresolvers to
  django.urls
- MIDDLEWARE_CLASSES changed to MIDDLEWARE
- Model ForeignKey on_delete=models.CASCADE changed from implicit to
  explicit

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Joel Sing (jsing)]

LGTM, thanks.

review: Approve (+1)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 63

=== modified file 'turku_api/admin.py'
--- turku_api/admin.py	2020-03-24 23:07:22 +0000
+++ turku_api/admin.py	2020-04-11 21:24:06 +0000
@@ -20,7 +20,10 @@
 from django.utils.html import format_html
 from django.utils import timezone
 from django.contrib.humanize.templatetags.humanize import naturaltime
-from django.core.urlresolvers import reverse
+try:
+    from django.urls import reverse  # 1.10+
+except ModuleNotFoundError:
+    from django.core.urlresolvers import reverse  # pre-1.10
 import datetime
 
 

=== modified file 'turku_api/models.py'
--- turku_api/models.py	2020-03-24 23:07:22 +0000
+++ turku_api/models.py	2020-04-11 21:24:06 +0000
@@ -172,7 +172,7 @@
         help_text='Available disk space of this storage unit\'s storage directories, in MiB.',
     )
     auth = models.ForeignKey(
-        Auth, validators=[validate_storage_auth],
+        Auth, validators=[validate_storage_auth], on_delete=models.CASCADE,
         help_text='Storage auth used to register this storage unit.',
     )
     active = models.BooleanField(
@@ -248,11 +248,11 @@
         help_text='SSH public key of this machine\'s agent.',
     )
     auth = models.ForeignKey(
-        Auth, validators=[validate_machine_auth],
+        Auth, validators=[validate_machine_auth], on_delete=models.CASCADE,
         help_text='Machine auth used to register this machine.',
     )
     storage = models.ForeignKey(
-        Storage,
+        Storage, on_delete=models.CASCADE,
         help_text='Storage unit this machine is assigned to.',
     )
     active = models.BooleanField(
@@ -303,7 +303,7 @@
         help_text='Computer-readable source name identifier.',
     )
     machine = models.ForeignKey(
-        Machine,
+        Machine, on_delete=models.CASCADE,
         help_text='Machine this source belongs to.',
     )
     comment = models.CharField(
@@ -400,7 +400,7 @@
 class BackupLog(models.Model):
     id = UuidPrimaryKeyField()
     source = models.ForeignKey(
-        Source,
+        Source, on_delete=models.CASCADE,
         help_text='Source this log entry belongs to.',
     )
     date = models.DateTimeField(
@@ -408,7 +408,7 @@
         help_text='Date/time this log entry was received/processed.',
     )
     storage = models.ForeignKey(
-        Storage, blank=True, null=True,
+        Storage, blank=True, null=True, on_delete=models.CASCADE,
         help_text='Storage unit this backup occurred on.',
     )
     success = models.BooleanField(

=== modified file 'turku_api/settings.py'
--- turku_api/settings.py	2020-03-24 23:07:22 +0000
+++ turku_api/settings.py	2020-04-11 21:24:06 +0000
@@ -31,7 +31,7 @@
     'django.contrib.staticfiles',
     'turku_api',
 )
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = (
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
@@ -39,6 +39,7 @@
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
+MIDDLEWARE_CLASSES = MIDDLEWARE  # pre-1.10
 ROOT_URLCONF = 'turku_api.urls'
 WSGI_APPLICATION = 'turku_api.wsgi.application'
 LANGUAGE_CODE = 'en-us'

=== modified file 'turku_api/urls.py'
--- turku_api/urls.py	2020-03-24 21:50:17 +0000
+++ turku_api/urls.py	2020-04-11 21:24:06 +0000
@@ -15,7 +15,10 @@
 # <http://www.gnu.org/licenses/>.
 
 from django.conf.urls import include, url
-from django.core.urlresolvers import reverse_lazy
+try:
+    from django.urls import reverse_lazy  # 1.10+
+except ModuleNotFoundError:
+    from django.core.urlresolvers import reverse_lazy  # pre-1.10
 from django.views.generic.base import RedirectView
 from turku_api import views
 from django.contrib import admin
@@ -32,7 +35,7 @@
     url(r'^v1/storage_ping_checkin$', views.storage_ping_checkin, name='storage_ping_checkin'),
     url(r'^v1/storage_ping_source_update$', views.storage_ping_source_update, name='storage_ping_source_update'),
     url(r'^v1/storage_update_config$', views.storage_update_config, name='storage_update_config'),
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
 ]
 
 try: