Rebase migrations in preparation for 3.70

fixes #268
pulp · Dec 11, 2024 · 790a3d4 · 790a3d4
1 parent 769f0fe
commit 790a3d4
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 84 deletions.
diff --git a/CHANGES/268.misc b/CHANGES/268.misc
@@ -0,0 +1 @@
+Rebase migrations to prepare for pulpcore 3.70.
diff --git a/pulp_npm/app/migrations/0001_initial.py b/pulp_npm/app/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.9 on 2020-01-03 14:04
+# Generated by Django 4.2.16 on 2024-12-11 16:36
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -8,106 +8,54 @@ class Migration(migrations.Migration):
 
     initial = True
 
-    dependencies = [("core", "0018_auto_20191127_2350")]
+    dependencies = [
+        ('core', '0091_systemid'),
+    ]
 
     operations = [
         migrations.CreateModel(
-            name="NpmRemote",
+            name='NpmRemote',
             fields=[
-                (
-                    "remote_ptr",
-                    models.OneToOneField(
-                        auto_created=True,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        parent_link=True,
-                        primary_key=True,
-                        related_name="npm_npmremote",
-                        serialize=False,
-                        to="core.Remote",
-                    ),
-                )
+                ('remote_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='npm_npmremote', serialize=False, to='core.remote')),
             ],
-            options={"default_related_name": "%(app_label)s_%(model_name)s"},
-            bases=("core.remote",),
+            options={
+                'default_related_name': '%(app_label)s_%(model_name)s',
+            },
+            bases=('core.remote',),
         ),
         migrations.CreateModel(
-            name="NpmRepository",
+            name='NpmRepository',
             fields=[
-                (
-                    "repository_ptr",
-                    models.OneToOneField(
-                        auto_created=True,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        parent_link=True,
-                        primary_key=True,
-                        related_name="npm_npmrepository",
-                        serialize=False,
-                        to="core.Repository",
-                    ),
-                )
+                ('repository_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='npm_npmrepository', serialize=False, to='core.repository')),
             ],
-            options={"default_related_name": "%(app_label)s_%(model_name)s"},
-            bases=("core.repository",),
+            options={
+                'default_related_name': '%(app_label)s_%(model_name)s',
+            },
+            bases=('core.repository',),
         ),
         migrations.CreateModel(
-            name="Package",
+            name='Package',
             fields=[
-                (
-                    "content_ptr",
-                    models.OneToOneField(
-                        auto_created=True,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        parent_link=True,
-                        primary_key=True,
-                        related_name="npm_package",
-                        serialize=False,
-                        to="core.Content",
-                    ),
-                ),
-                ("name", models.CharField(max_length=214)),
-                ("version", models.CharField(max_length=16)),
+                ('content_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='npm_package', serialize=False, to='core.content')),
+                ('name', models.CharField(max_length=214)),
+                ('version', models.CharField(max_length=16)),
             ],
             options={
-                "default_related_name": "%(app_label)s_%(model_name)s",
-                "unique_together": {("name", "version")},
+                'default_related_name': '%(app_label)s_%(model_name)s',
+                'unique_together': {('name', 'version')},
             },
-            bases=("core.content",),
+            bases=('core.content',),
         ),
         migrations.CreateModel(
-            name="NpmDistribution",
+            name='NpmDistribution',
             fields=[
-                (
-                    "basedistribution_ptr",
-                    models.OneToOneField(
-                        auto_created=True,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        parent_link=True,
-                        primary_key=True,
-                        related_name="npm_npmdistribution",
-                        serialize=False,
-                        to="core.BaseDistribution",
-                    ),
-                ),
-                (
-                    "repository",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        related_name="npm_npmdistribution",
-                        to="core.Repository",
-                    ),
-                ),
-                (
-                    "repository_version",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        related_name="npm_npmdistribution",
-                        to="core.RepositoryVersion",
-                    ),
-                ),
+                ('basedistribution_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='npm_npmdistribution', serialize=False, to='core.basedistribution')),
+                ('repository', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='npm_npmdistribution', to='core.repository')),
+                ('repository_version', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='npm_npmdistribution', to='core.repositoryversion')),
             ],
-            options={"default_related_name": "%(app_label)s_%(model_name)s"},
-            bases=("core.basedistribution",),
+            options={
+                'default_related_name': '%(app_label)s_%(model_name)s',
+            },
+            bases=('core.basedistribution',),
         ),
     ]
diff --git a/pulp_npm/app/migrations/0002_swap_distribution_model.py b/pulp_npm/app/migrations/0002_swap_distribution_model.py
@@ -51,7 +51,6 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('npm', '0001_initial'),
-        ('core', '0062_add_new_distribution_mastermodel'),
     ]
 
     operations = [
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Rebase migrations to prepare for pulpcore 3.70.