Revert "Closes #13647: Squash all migrations prior to v3.7 (#14853)"

This reverts commit 1da6869039.

netbox/users/migrations/0001_squashed_0011.py

@@ -1,10 +1,9 @@
 from django.conf import settings
+import django.contrib.auth.models
 import django.contrib.postgres.fields
 import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion
-import ipam.fields
-import users.models
 
 
 class Migration(migrations.Migration):
@@ -12,13 +11,12 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('contenttypes', '0002_remove_content_type_name'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('contenttypes', '0002_remove_content_type_name'),
         ('auth', '0012_alter_user_first_name_max_length'),
     ]
 
     replaces = [
-        # Squashed for v3.0
         ('users', '0001_api_tokens'),
         ('users', '0002_unicode_literals'),
         ('users', '0003_token_permissions'),
@@ -30,95 +28,49 @@ class Migration(migrations.Migration):
         ('users', '0009_replicate_permissions'),
         ('users', '0010_update_jsonfield'),
         ('users', '0011_standardize_models'),
-
-        # Squashed for v4.0
-        ('users', '0002_standardize_id_fields'),
-        ('users', '0003_token_allowed_ips_last_used'),
-        ('users', '0004_netboxgroup_netboxuser'),
     ]
 
     operations = [
-        migrations.CreateModel(
-            name='NetBoxGroup',
-            fields=[
-            ],
-            options={
-                'verbose_name': 'group',
-                'verbose_name_plural': 'groups',
-                'ordering': ('name',),
-                'proxy': True,
-                'indexes': [],
-                'constraints': [],
-            },
-            bases=('auth.group',),
-            managers=[
-                ('objects', users.models.NetBoxGroupManager()),
-            ],
-        ),
-        migrations.CreateModel(
-            name='NetBoxUser',
-            fields=[
-            ],
-            options={
-                'verbose_name': 'user',
-                'verbose_name_plural': 'users',
-                'ordering': ('username',),
-                'proxy': True,
-                'indexes': [],
-                'constraints': [],
-            },
-            bases=('auth.user',),
-            managers=[
-                ('objects', users.models.NetBoxUserManager()),
-            ],
-        ),
         migrations.CreateModel(
             name='UserConfig',
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
                 ('data', models.JSONField(default=dict)),
                 ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='config', to=settings.AUTH_USER_MODEL)),
             ],
             options={
-                'verbose_name': 'user preferences',
-                'verbose_name_plural': 'user preferences',
+                'verbose_name': 'User Preferences',
+                'verbose_name_plural': 'User Preferences',
                 'ordering': ['user'],
             },
         ),
         migrations.CreateModel(
             name='Token',
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)),
+                ('id', models.BigAutoField(primary_key=True, serialize=False)),
                 ('created', models.DateTimeField(auto_now_add=True)),
                 ('expires', models.DateTimeField(blank=True, null=True)),
-                ('last_used', models.DateTimeField(blank=True, null=True)),
                 ('key', models.CharField(max_length=40, unique=True, validators=[django.core.validators.MinLengthValidator(40)])),
                 ('write_enabled', models.BooleanField(default=True)),
                 ('description', models.CharField(blank=True, max_length=200)),
-                ('allowed_ips', django.contrib.postgres.fields.ArrayField(base_field=ipam.fields.IPNetworkField(), blank=True, null=True, size=None)),
                 ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='tokens', to=settings.AUTH_USER_MODEL)),
             ],
-            options={
-                'verbose_name': 'token',
-                'verbose_name_plural': 'tokens',
-            },
         ),
         migrations.CreateModel(
             name='ObjectPermission',
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)),
+                ('id', models.BigAutoField(primary_key=True, serialize=False)),
                 ('name', models.CharField(max_length=100)),
                 ('description', models.CharField(blank=True, max_length=200)),
                 ('enabled', models.BooleanField(default=True)),
                 ('actions', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=30), size=None)),
                 ('constraints', models.JSONField(blank=True, null=True)),
-                ('groups', models.ManyToManyField(blank=True, related_name='object_permissions', to='auth.group')),
-                ('object_types', models.ManyToManyField(limit_choices_to=models.Q(models.Q(models.Q(('app_label__in', ['account', 'admin', 'auth', 'contenttypes', 'sessions', 'taggit', 'users']), _negated=True), models.Q(('app_label', 'auth'), ('model__in', ['group', 'user'])), models.Q(('app_label', 'users'), ('model__in', ['objectpermission', 'token'])), _connector='OR')), related_name='object_permissions', to='contenttypes.contenttype')),
+                ('groups', models.ManyToManyField(blank=True, related_name='object_permissions', to='auth.Group')),
+                ('object_types', models.ManyToManyField(limit_choices_to=models.Q(models.Q(models.Q(('app_label__in', ['account', 'admin', 'auth', 'contenttypes', 'sessions', 'taggit', 'users']), _negated=True), models.Q(('app_label', 'auth'), ('model__in', ['group', 'user'])), models.Q(('app_label', 'users'), ('model__in', ['objectpermission', 'token'])), _connector='OR')), related_name='object_permissions', to='contenttypes.ContentType')),
                 ('users', models.ManyToManyField(blank=True, related_name='object_permissions', to=settings.AUTH_USER_MODEL)),
             ],
             options={
                 'verbose_name': 'permission',
-                'verbose_name_plural': 'permissions',
                 'ordering': ['name'],
             },
         ),

netbox/users/migrations/0002_standardize_id_fields.py

@@ -0,0 +1,27 @@
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dcim', '0145_site_remove_deprecated_fields'),
+        ('users', '0001_squashed_0011'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='objectpermission',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False),
+        ),
+        migrations.AlterField(
+            model_name='token',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False),
+        ),
+        migrations.AlterField(
+            model_name='userconfig',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False),
+        ),
+    ]

netbox/users/migrations/0003_token_allowed_ips_last_used.py

@@ -0,0 +1,23 @@
+import django.contrib.postgres.fields
+from django.db import migrations, models
+import ipam.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0002_standardize_id_fields'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='token',
+            name='allowed_ips',
+            field=django.contrib.postgres.fields.ArrayField(base_field=ipam.fields.IPNetworkField(), blank=True, null=True, size=None),
+        ),
+        migrations.AddField(
+            model_name='token',
+            name='last_used',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+    ]

netbox/users/migrations/0004_netboxgroup_netboxuser.py

@@ -0,0 +1,50 @@
+# Generated by Django 4.1.9 on 2023-06-06 18:15
+
+import django.contrib.auth.models
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('auth', '0012_alter_user_first_name_max_length'),
+        ('users', '0003_token_allowed_ips_last_used'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='NetBoxGroup',
+            fields=[],
+            options={
+                'verbose_name': 'Group',
+                'proxy': True,
+                'indexes': [],
+                'constraints': [],
+            },
+            bases=('auth.group',),
+            managers=[
+                ('objects', django.contrib.auth.models.GroupManager()),
+            ],
+        ),
+        migrations.CreateModel(
+            name='NetBoxUser',
+            fields=[],
+            options={
+                'verbose_name': 'User',
+                'proxy': True,
+                'indexes': [],
+                'constraints': [],
+            },
+            bases=('auth.user',),
+            managers=[
+                ('objects', django.contrib.auth.models.UserManager()),
+            ],
+        ),
+        migrations.AlterModelOptions(
+            name='netboxgroup',
+            options={'ordering': ('name',), 'verbose_name': 'Group'},
+        ),
+        migrations.AlterModelOptions(
+            name='netboxuser',
+            options={'ordering': ('username',), 'verbose_name': 'User'},
+        ),
+    ]