Django 3 semi-stable

addons/bitbucket/migrations/0001_initial.py

@@ -15,7 +15,6 @@ class Migration(migrations.Migration):
 
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('osf', '0042_auto_20170707_1019'),
     ]
 
     operations = [

addons/gitlab/migrations/0001_initial.py

@@ -15,7 +15,6 @@ class Migration(migrations.Migration):
 
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('osf', '0065_auto_20171024_1330'),
     ]
 
     operations = [

addons/onedrive/migrations/0001_initial.py

@@ -15,7 +15,6 @@ class Migration(migrations.Migration):
 
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('osf', '0067_auto_20171121_1050'),
     ]
 
     operations = [

addons/osfstorage/migrations/0001_initial.py

@@ -1,28 +1,74 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9 on 2017-03-23 20:34
-from __future__ import unicode_literals
+# Generated by Django 3.2 on 2022-08-08 15:38
 
+import addons.base.models
+from django.conf import settings
 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 = [
+        ('osf', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
+        migrations.CreateModel(
+            name='Region',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('_id', models.CharField(db_index=True, max_length=255)),
+                ('name', models.CharField(max_length=200)),
+                ('waterbutler_credentials', osf.utils.fields.EncryptedJSONField(default=dict)),
+                ('waterbutler_url', models.URLField(default='http://localhost:7777')),
+                ('mfr_url', models.URLField(default='http://localhost:7778')),
+                ('waterbutler_settings', osf.utils.datetime_aware_jsonfield.DateTimeAwareJSONField(default=dict, encoder=osf.utils.datetime_aware_jsonfield.DateTimeAwareJSONEncoder)),
+            ],
+            options={
+                'unique_together': {('_id', 'name')},
+            },
+        ),
+        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)),
+                ('is_deleted', models.BooleanField(default=False)),
+                ('deleted', osf.utils.fields.NonNaiveDateTimeField(blank=True, null=True)),
+                ('default_region', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='addons_osfstorage.region')),
+                ('owner', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='addons_osfstorage_user_settings', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=(models.Model, osf.models.base.QuerySetExplainMixin),
+        ),
         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)),
+                ('owner', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='addons_osfstorage_node_settings', to='osf.abstractnode')),
+                ('region', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='addons_osfstorage.region')),
+                ('root_node', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='osf.osfstoragefolder')),
+                ('user_settings', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='addons_osfstorage.usersettings')),
             ],
             options={
                 'abstract': False,
             },
+            bases=(models.Model, osf.models.base.QuerySetExplainMixin, addons.base.models.BaseStorageAddon),
         ),
     ]

addons/osfstorage/models.py

@@ -408,7 +408,7 @@ def save(self, skip_search=False, *args, **kwargs):
 
 class OsfStorageFolder(OsfStorageFileNode, Folder):
 
-    is_root = models.NullBooleanField()
+    is_root = models.BooleanField(null=True, blank=True)
 
     objects = OsfStorageFolderManager()
 

addons/wiki/migrations/0006_wikipage_wikiversion.py

@@ -14,7 +14,6 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('osf', '0077_add_maintenance_permissions'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ('addons_wiki', '0005_auto_20170713_1125'),
     ]