From d461d766974acdbac71d5b0e83ab2809f440e59e Mon Sep 17 00:00:00 2001 From: Matthias Dellweg Date: Wed, 11 Dec 2024 17:44:46 +0100 Subject: [PATCH] Rebase migrations in preparation for 3.70 fixes #774 --- CHANGES/774.misc | 1 + pulp_python/app/migrations/0001_initial.py | 16 ++++++++-------- .../0004_DATA_swap_distribution_model.py | 1 - 3 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 CHANGES/774.misc diff --git a/CHANGES/774.misc b/CHANGES/774.misc new file mode 100644 index 00000000..27489693 --- /dev/null +++ b/CHANGES/774.misc @@ -0,0 +1 @@ +Rebase migrations to prepare for pulpcore 3.70. diff --git a/pulp_python/app/migrations/0001_initial.py b/pulp_python/app/migrations/0001_initial.py index cbdc189c..b67df3d9 100644 --- a/pulp_python/app/migrations/0001_initial.py +++ b/pulp_python/app/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.3 on 2020-06-18 13:55 +# Generated by Django 4.2.16 on 2024-12-11 16:42 import django.contrib.postgres.fields.jsonb from django.db import migrations, models @@ -10,14 +10,14 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('core', '0032_export_to_chunks'), + ('core', '0091_systemid'), ] operations = [ migrations.CreateModel( name='PythonPublication', fields=[ - ('publication_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='python_pythonpublication', serialize=False, to='core.Publication')), + ('publication_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='python_pythonpublication', serialize=False, to='core.publication')), ], options={ 'default_related_name': '%(app_label)s_%(model_name)s', @@ -27,7 +27,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='PythonRemote', fields=[ - ('remote_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='python_pythonremote', 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='python_pythonremote', serialize=False, to='core.remote')), ('prereleases', models.BooleanField(default=False)), ('includes', django.contrib.postgres.fields.jsonb.JSONField(default=list)), ('excludes', django.contrib.postgres.fields.jsonb.JSONField(default=list)), @@ -40,7 +40,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='PythonRepository', fields=[ - ('repository_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='python_pythonrepository', 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='python_pythonrepository', serialize=False, to='core.repository')), ], options={ 'default_related_name': '%(app_label)s_%(model_name)s', @@ -50,7 +50,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='PythonPackageContent', fields=[ - ('content_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='python_pythonpackagecontent', serialize=False, to='core.Content')), + ('content_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='python_pythonpackagecontent', serialize=False, to='core.content')), ('filename', models.TextField(db_index=True, unique=True)), ('packagetype', models.TextField(choices=[('bdist_dmg', 'bdist_dmg'), ('bdist_dumb', 'bdist_dumb'), ('bdist_egg', 'bdist_egg'), ('bdist_msi', 'bdist_msi'), ('bdist_rpm', 'bdist_rpm'), ('bdist_wheel', 'bdist_wheel'), ('bdist_wininst', 'bdist_wininst'), ('sdist', 'sdist')])), ('name', models.TextField()), @@ -85,8 +85,8 @@ class Migration(migrations.Migration): migrations.CreateModel( name='PythonDistribution', fields=[ - ('basedistribution_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='python_pythondistribution', serialize=False, to='core.BaseDistribution')), - ('publication', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='python_pythondistribution', to='core.Publication')), + ('basedistribution_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='python_pythondistribution', serialize=False, to='core.basedistribution')), + ('publication', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='python_pythondistribution', to='core.publication')), ], options={ 'default_related_name': '%(app_label)s_%(model_name)s', diff --git a/pulp_python/app/migrations/0004_DATA_swap_distribution_model.py b/pulp_python/app/migrations/0004_DATA_swap_distribution_model.py index 9449de83..07f443f3 100644 --- a/pulp_python/app/migrations/0004_DATA_swap_distribution_model.py +++ b/pulp_python/app/migrations/0004_DATA_swap_distribution_model.py @@ -48,7 +48,6 @@ class Migration(migrations.Migration): atomic = False dependencies = [ - ('core', '0062_add_new_distribution_mastermodel'), ('python', '0003_new_sync_filters'), ]