[Django Upgrade] [Reference PR] The rest of the fixes

addons/bitbucket/migrations/0001_initial.py

@@ -1,56 +1,55 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.2 on 2017-07-07 15:19
+# Generated by Django 1.11.29 on 2022-08-17 19:15
 from __future__ import unicode_literals
 
-from django.conf import settings
+import addons.base.models
 from django.db import migrations, models
-import django.db.models.deletion
+import django_extensions.db.fields
 import osf.models.base
 import osf.utils.datetime_aware_jsonfield
+import osf.utils.fields
 
 
 class Migration(migrations.Migration):
 
     initial = True
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('osf', '0042_auto_20170707_1019'),
     ]
 
     operations = [
         migrations.CreateModel(
             name='NodeSettings',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', django_extensions.db.fields.CreationDateTimeField(auto_now_add=True, verbose_name='created')),
+                ('modified', django_extensions.db.fields.ModificationDateTimeField(auto_now=True, verbose_name='modified')),
                 ('_id', models.CharField(db_index=True, default=osf.models.base.generate_object_id, max_length=24, unique=True)),
-                ('deleted', models.BooleanField(default=False)),
+                ('is_deleted', models.BooleanField(default=False)),
+                ('deleted', osf.utils.fields.NonNaiveDateTimeField(blank=True, null=True)),
                 ('user', models.TextField(blank=True, null=True)),
                 ('repo', models.TextField(blank=True, null=True)),
                 ('hook_id', models.TextField(blank=True, null=True)),
-                ('external_account', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='addons_bitbucket_node_settings', to='osf.ExternalAccount')),
-                ('owner', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='addons_bitbucket_node_settings', to='osf.AbstractNode')),
             ],
             options={
                 'abstract': False,
             },
+            bases=(models.Model, osf.models.base.QuerySetExplainMixin, addons.base.models.BaseStorageAddon),
         ),
         migrations.CreateModel(
             name='UserSettings',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', django_extensions.db.fields.CreationDateTimeField(auto_now_add=True, verbose_name='created')),
+                ('modified', django_extensions.db.fields.ModificationDateTimeField(auto_now=True, verbose_name='modified')),
                 ('_id', models.CharField(db_index=True, default=osf.models.base.generate_object_id, max_length=24, unique=True)),
-                ('deleted', models.BooleanField(default=False)),
+                ('is_deleted', models.BooleanField(default=False)),
+                ('deleted', osf.utils.fields.NonNaiveDateTimeField(blank=True, null=True)),
                 ('oauth_grants', osf.utils.datetime_aware_jsonfield.DateTimeAwareJSONField(blank=True, default=dict, encoder=osf.utils.datetime_aware_jsonfield.DateTimeAwareJSONEncoder)),
-                ('owner', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='addons_bitbucket_user_settings', to=settings.AUTH_USER_MODEL)),
             ],
             options={
                 'abstract': False,
             },
-        ),
-        migrations.AddField(
-            model_name='nodesettings',
-            name='user_settings',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='addons_bitbucket.UserSettings'),
+            bases=(models.Model, osf.models.base.QuerySetExplainMixin),
         ),
     ]

addons/bitbucket/migrations/0002_auto_20220817_1915.py

@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2022-08-17 19:15
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('addons_bitbucket', '0001_initial'),
+        ('osf', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='usersettings',
+            name='owner',
+            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='addons_bitbucket_user_settings', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='nodesettings',
+            name='external_account',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='addons_bitbucket_node_settings', to='osf.ExternalAccount'),
+        ),
+        migrations.AddField(
+            model_name='nodesettings',
+            name='owner',
+            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='addons_bitbucket_node_settings', to='osf.AbstractNode'),
+        ),
+        migrations.AddField(
+            model_name='nodesettings',
+            name='user_settings',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='addons_bitbucket.UserSettings'),
+        ),
+    ]

addons/box/migrations/0001_initial.py

@@ -1,10 +1,13 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9 on 2017-03-23 20:34
+# Generated by Django 1.11.29 on 2022-08-17 19:15
 from __future__ import unicode_literals
 
+import addons.base.models
 from django.db import migrations, models
+import django_extensions.db.fields
 import osf.models.base
 import osf.utils.datetime_aware_jsonfield
+import osf.utils.fields
 
 
 class Migration(migrations.Migration):
@@ -19,26 +22,34 @@ class Migration(migrations.Migration):
             name='NodeSettings',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', django_extensions.db.fields.CreationDateTimeField(auto_now_add=True, verbose_name='created')),
+                ('modified', django_extensions.db.fields.ModificationDateTimeField(auto_now=True, verbose_name='modified')),
                 ('_id', models.CharField(db_index=True, default=osf.models.base.generate_object_id, max_length=24, unique=True)),
-                ('deleted', models.BooleanField(default=False)),
+                ('is_deleted', models.BooleanField(default=False)),
+                ('deleted', osf.utils.fields.NonNaiveDateTimeField(blank=True, null=True)),
                 ('folder_id', models.TextField(blank=True, null=True)),
                 ('folder_name', models.TextField(blank=True, null=True)),
                 ('folder_path', models.TextField(blank=True, null=True)),
             ],
             options={
                 'abstract': False,
             },
+            bases=(models.Model, osf.models.base.QuerySetExplainMixin, addons.base.models.BaseStorageAddon),
         ),
         migrations.CreateModel(
             name='UserSettings',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', django_extensions.db.fields.CreationDateTimeField(auto_now_add=True, verbose_name='created')),
+                ('modified', django_extensions.db.fields.ModificationDateTimeField(auto_now=True, verbose_name='modified')),
                 ('_id', models.CharField(db_index=True, default=osf.models.base.generate_object_id, max_length=24, unique=True)),
-                ('deleted', models.BooleanField(default=False)),
-                ('oauth_grants', osf.utils.datetime_aware_jsonfield.DateTimeAwareJSONField(blank=True, default=dict)),
+                ('is_deleted', models.BooleanField(default=False)),
+                ('deleted', osf.utils.fields.NonNaiveDateTimeField(blank=True, null=True)),
+                ('oauth_grants', osf.utils.datetime_aware_jsonfield.DateTimeAwareJSONField(blank=True, default=dict, encoder=osf.utils.datetime_aware_jsonfield.DateTimeAwareJSONEncoder)),
             ],
             options={
                 'abstract': False,
             },
+            bases=(models.Model, osf.models.base.QuerySetExplainMixin),
         ),
     ]

addons/box/migrations/0002_auto_20170323_1534.py → addons/box/migrations/0002_auto_20220817_1915.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9 on 2017-03-23 20:34
+# Generated by Django 1.11.29 on 2022-08-17 19:15
 from __future__ import unicode_literals
 
 from django.conf import settings
@@ -12,9 +12,9 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
+        ('addons_box', '0001_initial'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ('osf', '0001_initial'),
-        ('addons_box', '0001_initial'),
     ]
 
     operations = [

addons/dataverse/migrations/0001_initial.py

@@ -1,10 +1,13 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9 on 2017-03-23 20:34
+# Generated by Django 1.11.29 on 2022-08-17 19:15
 from __future__ import unicode_literals
 
+import addons.base.models
 from django.db import migrations, models
+import django_extensions.db.fields
 import osf.models.base
 import osf.utils.datetime_aware_jsonfield
+import osf.utils.fields
 
 
 class Migration(migrations.Migration):
@@ -19,8 +22,11 @@ class Migration(migrations.Migration):
             name='NodeSettings',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', django_extensions.db.fields.CreationDateTimeField(auto_now_add=True, verbose_name='created')),
+                ('modified', django_extensions.db.fields.ModificationDateTimeField(auto_now=True, verbose_name='modified')),
                 ('_id', models.CharField(db_index=True, default=osf.models.base.generate_object_id, max_length=24, unique=True)),
-                ('deleted', models.BooleanField(default=False)),
+                ('is_deleted', models.BooleanField(default=False)),
+                ('deleted', osf.utils.fields.NonNaiveDateTimeField(blank=True, null=True)),
                 ('dataverse_alias', models.TextField(blank=True, null=True)),
                 ('dataverse', models.TextField(blank=True, null=True)),
                 ('dataset_doi', models.TextField(blank=True, null=True)),
@@ -30,17 +36,22 @@ class Migration(migrations.Migration):
             options={
                 'abstract': False,
             },
+            bases=(models.Model, osf.models.base.QuerySetExplainMixin, addons.base.models.BaseStorageAddon),
         ),
         migrations.CreateModel(
             name='UserSettings',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', django_extensions.db.fields.CreationDateTimeField(auto_now_add=True, verbose_name='created')),
+                ('modified', django_extensions.db.fields.ModificationDateTimeField(auto_now=True, verbose_name='modified')),
                 ('_id', models.CharField(db_index=True, default=osf.models.base.generate_object_id, max_length=24, unique=True)),
-                ('deleted', models.BooleanField(default=False)),
-                ('oauth_grants', osf.utils.datetime_aware_jsonfield.DateTimeAwareJSONField(blank=True, default=dict)),
+                ('is_deleted', models.BooleanField(default=False)),
+                ('deleted', osf.utils.fields.NonNaiveDateTimeField(blank=True, null=True)),
+                ('oauth_grants', osf.utils.datetime_aware_jsonfield.DateTimeAwareJSONField(blank=True, default=dict, encoder=osf.utils.datetime_aware_jsonfield.DateTimeAwareJSONEncoder)),
             ],
             options={
                 'abstract': False,
             },
+            bases=(models.Model, osf.models.base.QuerySetExplainMixin),
         ),
     ]

addons/dataverse/migrations/0002_auto_20170323_1534.py → addons/dataverse/migrations/0002_auto_20220817_1915.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9 on 2017-03-23 20:34
+# Generated by Django 1.11.29 on 2022-08-17 19:15
 from __future__ import unicode_literals
 
 from django.conf import settings