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

[Ryan Finnie]

Add compatibility for Django 1.8~1.11 (xenial/bionic):
- Disable admin form "related links" (form children links) -- broken as of
  1.8, would be nice to have back if someone can figure out a replacement
- Add "fields = '__all__'" to admin forms
- Remove south migrations
- Port TEMPLATE_DIRS to TEMPLATES
- Change urlpatterns from patterns() to url() list

Changes have been tested as being backwards compatible to 1.6 (trusty).

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

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

[Ryan Finnie (fo0bar)]

(Yes, the MP date is correct, this is from 2018 and apparently slipped through the cracks.)

[Joel Sing (jsing)]

LGTM

review: Approve (+1)

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

Failed to merge change (unable to merge source branch due to conflicts), setting status to needs review.

[lp:~fo0bar/turku/bionic]

60. By Ryan Finnie on 2020-03-24

Add compatibility for Django 1.8~1.11 (xenial/bionic)

- Disable admin form "related links" (form children links) -- broken as of
  1.8, would be nice to have back if someone can figure out a replacement
- Add "fields = '__all__'" to admin forms
- Remove south migrations
- Port TEMPLATE_DIRS to TEMPLATES
- Change urlpatterns from patterns() to url() list

Changes have been tested as being backwards compatible to 1.6 (trusty).

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

Change successfully merged at revision 60

=== modified file 'turku_api/admin.py'
--- turku_api/admin.py	2017-06-13 12:12:05 +0000
+++ turku_api/admin.py	2020-03-24 21:51:29 +0000
@@ -59,10 +59,11 @@
 
     def render_change_form(self, request, context, *args, **kwargs):
         related_links = []
-        if 'object_id' in context:
-            for obj in self.model._meta.get_all_related_objects():
-                count = obj.model.objects.filter(**{obj.field.name: context['object_id']}).count()
-                related_links.append((obj, count))
+        # Broken in Django 1.8+; see if related_links can be re-implemented
+        #if 'object_id' in context:
+        #    for obj in self.model._meta.get_all_related_objects():
+        #        count = obj.model.objects.filter(**{obj.field.name: context['object_id']}).count()
+        #        related_links.append((obj, count))
         context.update({'related_links': related_links})
 
         return super(CustomModelAdmin, self).render_change_form(request, context, *args, **kwargs)
@@ -71,6 +72,7 @@
 class MachineAdminForm(forms.ModelForm):
     class Meta:
         model = Machine
+        fields = '__all__'
 
     def __init__(self, *args, **kwargs):
         super(MachineAdminForm, self).__init__(*args, **kwargs)
@@ -80,6 +82,7 @@
 class StorageAdminForm(forms.ModelForm):
     class Meta:
         model = Storage
+        fields = '__all__'
 
     def __init__(self, *args, **kwargs):
         super(StorageAdminForm, self).__init__(*args, **kwargs)
 
=== removed directory 'turku_api/migrations'
=== removed file 'turku_api/migrations/0001_initial.py'
=== removed file 'turku_api/migrations/0002_add_field_source_published.py'
=== removed file 'turku_api/migrations/0003_noop.py'
=== removed file 'turku_api/migrations/0004_add_field_auth_name.py'
=== removed file 'turku_api/migrations/0005_add_hashed_secrets_fields.py'
=== removed file 'turku_api/migrations/0006_hash_secrets.py'
=== removed file 'turku_api/migrations/0007_remove_unhashed_secrets_fields.py'
=== removed file 'turku_api/migrations/0008_fix_auth_unique_together.py'
=== removed file 'turku_api/migrations/0009_use_uuid_primary_key_field.py'
=== removed file 'turku_api/migrations/0010_auto__add_backuplog.py'
=== removed file 'turku_api/migrations/0011_auto__add_field_source_success.py'
=== removed file 'turku_api/migrations/0012_auto__add_filterset__add_field_source_filter.py'
=== removed file 'turku_api/migrations/0013_auto__add_field_backuplog_snapshot.py'
=== removed file 'turku_api/migrations/0014_auto__add_field_storage_space_total__add_field_storage_space_available.py'
=== removed file 'turku_api/migrations/0015_auto__add_field_source_snapshot_mode.py'
=== removed file 'turku_api/migrations/0016_auto__chg_field_source_username__chg_field_source_password.py'
=== removed file 'turku_api/migrations/0017_auto__add_field_source_bwlimit.py'
=== removed file 'turku_api/migrations/0018_auto__del_field_source_username__del_field_source_password.py'
=== removed file 'turku_api/migrations/0019_auto__add_field_auth_secret_hash__add_unique_auth_name__del_unique_aut.py'
=== removed file 'turku_api/migrations/0020_hash_auth_secrets.py'
=== removed file 'turku_api/migrations/0021_auto__del_field_auth_secret__chg_field_auth_secret_hash.py'
=== removed file 'turku_api/migrations/0022_auto__add_field_machine_published.py'
=== removed file 'turku_api/migrations/0023_auto__add_field_storage_published.py'
=== removed file 'turku_api/migrations/0024_auto__add_field_source_preserve_hard_links.py'
=== removed file 'turku_api/migrations/__init__.py'
=== modified file 'turku_api/models.py'
--- turku_api/models.py	2019-10-29 10:07:18 +0000
+++ turku_api/models.py	2020-03-24 21:51:29 +0000
@@ -20,7 +20,6 @@
 from django.contrib.auth.hashers import is_password_usable
 from django.utils import timezone
 from datetime import timedelta
-from south.modelsinspector import add_introspection_rules
 import json
 import uuid
 
@@ -462,6 +461,3 @@
 
     def __unicode__(self):
         return self.name
-
-
-add_introspection_rules([], ["^turku_api\.models\.UuidPrimaryKeyField"])
 
=== modified file 'turku_api/settings.py'
--- turku_api/settings.py	2015-07-30 22:41:42 +0000
+++ turku_api/settings.py	2020-03-24 21:51:29 +0000
@@ -29,7 +29,6 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'south',
     'turku_api',
 )
 MIDDLEWARE_CLASSES = (
@@ -48,9 +47,21 @@
 USE_L10N = True
 USE_TZ = True
 STATIC_URL = '/static/'
-TEMPLATE_DIRS = (
-  os.path.join(BASE_DIR, 'turku_api/templates'),
-)
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [os.path.join(BASE_DIR, 'turku_api/templates')],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
 
=== modified file 'turku_api/urls.py'
--- turku_api/urls.py	2015-07-30 22:41:42 +0000
+++ turku_api/urls.py	2020-03-24 21:51:29 +0000
@@ -14,7 +14,7 @@
 # License along with this program.  If not, see
 # <http://www.gnu.org/licenses/>.
 
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 from django.core.urlresolvers import reverse_lazy
 from django.views.generic.base import RedirectView
 from turku_api import views
@@ -23,8 +23,7 @@
 
 admin.autodiscover()
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'^$', RedirectView.as_view(url=reverse_lazy('admin:index'))),
     url(r'^v1/health$', views.health, name='health'),
     url(r'^v1/update_config$', views.update_config, name='update_config'),
@@ -34,7 +33,7 @@
     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)),
-)
+]
 
 try:
     from local_urls import *