diff --git a/CHANGES/1204.misc b/CHANGES/1204.misc new file mode 100644 index 000000000..274896932 --- /dev/null +++ b/CHANGES/1204.misc @@ -0,0 +1 @@ +Rebase migrations to prepare for pulpcore 3.70. diff --git a/pulp_deb/app/migrations/0001_initial.py b/pulp_deb/app/migrations/0001_initial.py index 53f64edfb..7ac49c90d 100644 --- a/pulp_deb/app/migrations/0001_initial.py +++ b/pulp_deb/app/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.5 on 2019-09-04 12:09 +# Generated by Django 4.2.16 on 2024-12-11 16:34 from django.db import migrations, models import django.db.models.deletion @@ -9,14 +9,14 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('core', '0004_add_duplicated_reserved_resources'), + ('core', '0091_systemid'), ] operations = [ migrations.CreateModel( name='DebPublication', fields=[ - ('publication_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='deb_debpublication', 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='deb_debpublication', serialize=False, to='core.publication')), ('simple', models.BooleanField(default=False)), ('structured', models.BooleanField(default=False)), ], @@ -28,7 +28,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='DebRemote', fields=[ - ('remote_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='deb_debremote', 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='deb_debremote', serialize=False, to='core.remote')), ('distributions', models.CharField(max_length=255, null=True)), ('components', models.CharField(max_length=255, null=True)), ('architectures', models.CharField(max_length=255, null=True)), @@ -44,7 +44,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='VerbatimPublication', fields=[ - ('publication_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='deb_verbatimpublication', 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='deb_verbatimpublication', serialize=False, to='core.publication')), ], options={ 'default_related_name': '%(app_label)s_%(model_name)s', @@ -54,7 +54,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='Release', fields=[ - ('content_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='deb_release', 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='deb_release', serialize=False, to='core.content')), ('codename', models.CharField(max_length=255)), ('suite', models.CharField(max_length=255)), ('distribution', models.CharField(max_length=255)), @@ -72,7 +72,7 @@ class Migration(migrations.Migration): migrations.CreateModel( 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='deb_package', 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='deb_package', serialize=False, to='core.content')), ('package_name', models.CharField(max_length=255)), ('source', models.CharField(max_length=255, null=True)), ('version', models.CharField(max_length=255)), @@ -114,7 +114,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='InstallerPackage', fields=[ - ('content_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='deb_installerpackage', 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='deb_installerpackage', serialize=False, to='core.content')), ('package_name', models.CharField(max_length=255)), ('source', models.CharField(max_length=255, null=True)), ('version', models.CharField(max_length=255)), @@ -156,7 +156,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='GenericContent', fields=[ - ('content_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='deb_genericcontent', 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='deb_genericcontent', serialize=False, to='core.content')), ('relative_path', models.CharField(max_length=255)), ('sha256', models.CharField(max_length=255)), ], @@ -169,8 +169,8 @@ class Migration(migrations.Migration): migrations.CreateModel( name='DebDistribution', fields=[ - ('basedistribution_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='deb_debdistribution', serialize=False, to='core.BaseDistribution')), - ('publication', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='deb_debdistribution', 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='deb_debdistribution', serialize=False, to='core.basedistribution')), + ('publication', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='deb_debdistribution', to='core.publication')), ], options={ 'default_related_name': '%(app_label)s_%(model_name)s', @@ -180,12 +180,12 @@ class Migration(migrations.Migration): migrations.CreateModel( name='PackageIndex', fields=[ - ('content_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='deb_packageindex', 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='deb_packageindex', serialize=False, to='core.content')), ('component', models.CharField(max_length=255)), ('architecture', models.CharField(max_length=255)), ('relative_path', models.CharField(max_length=255)), ('sha256', models.CharField(max_length=255)), - ('release', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='deb_packageindex', to='deb.Release')), + ('release', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='deb_packageindex', to='deb.release')), ], options={ 'verbose_name_plural': 'PackageIndices', @@ -197,12 +197,12 @@ class Migration(migrations.Migration): migrations.CreateModel( name='InstallerFileIndex', fields=[ - ('content_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='deb_installerfileindex', 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='deb_installerfileindex', serialize=False, to='core.content')), ('component', models.CharField(max_length=255)), ('architecture', models.CharField(max_length=255)), ('relative_path', models.CharField(max_length=255)), ('sha256', models.CharField(max_length=255)), - ('release', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='deb_installerfileindex', to='deb.Release')), + ('release', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='deb_installerfileindex', to='deb.release')), ], options={ 'verbose_name_plural': 'InstallerFileIndices', diff --git a/pulp_deb/app/migrations/0005_rename_release_file.py b/pulp_deb/app/migrations/0005_rename_release_file.py index 99543e35c..1d1720ce3 100644 --- a/pulp_deb/app/migrations/0005_rename_release_file.py +++ b/pulp_deb/app/migrations/0005_rename_release_file.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.6 on 2019-10-28 13:38 +# Generated by Django 4.2.16 on 2024-12-11 16:34 from django.db import migrations, models import django.db.models.deletion @@ -7,25 +7,27 @@ class Migration(migrations.Migration): dependencies = [ - ('core', '0011_relative_path'), ('deb', '0004_auto_20191014_1722'), ] operations = [ - migrations.RenameModel('Release', 'ReleaseFile'), + migrations.RenameModel( + old_name='Release', + new_name='ReleaseFile', + ), migrations.AlterField( model_name='releasefile', name='content_ptr', - field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='deb_releasefile', serialize=False, to='core.Content'), + field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='deb_releasefile', serialize=False, to='core.content'), ), migrations.AlterField( model_name='installerfileindex', name='release', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='deb_installerfileindex', to='deb.ReleaseFile'), + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='deb_installerfileindex', to='deb.releasefile'), ), migrations.AlterField( model_name='packageindex', name='release', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='deb_packageindex', to='deb.ReleaseFile'), + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='deb_packageindex', to='deb.releasefile'), ), ] diff --git a/pulp_deb/app/migrations/0006_debrepository.py b/pulp_deb/app/migrations/0006_debrepository.py index f0818db6f..03f3d172a 100644 --- a/pulp_deb/app/migrations/0006_debrepository.py +++ b/pulp_deb/app/migrations/0006_debrepository.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.7 on 2019-11-12 12:46 +# Generated by Django 4.2.16 on 2024-12-11 16:34 from django.db import migrations, models import django.db.models.deletion @@ -7,7 +7,6 @@ class Migration(migrations.Migration): dependencies = [ - ('core', '0014_remove_repository_plugin_managed'), ('deb', '0005_rename_release_file'), ] @@ -15,7 +14,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='DebRepository', fields=[ - ('repository_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='deb_debrepository', 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='deb_debrepository', serialize=False, to='core.repository')), ], options={ 'default_related_name': '%(app_label)s_%(model_name)s', diff --git a/pulp_deb/app/migrations/0007_create_metadata_models.py b/pulp_deb/app/migrations/0007_create_metadata_models.py index dee623268..f9675ee0b 100644 --- a/pulp_deb/app/migrations/0007_create_metadata_models.py +++ b/pulp_deb/app/migrations/0007_create_metadata_models.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.7 on 2019-11-13 17:07 +# Generated by Django 4.2.16 on 2024-12-11 16:34 from django.db import migrations, models import django.db.models.deletion @@ -7,7 +7,6 @@ class Migration(migrations.Migration): dependencies = [ - ('core', '0014_remove_repository_plugin_managed'), ('deb', '0006_debrepository'), ] @@ -15,7 +14,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='Release', fields=[ - ('content_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='deb_release', 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='deb_release', serialize=False, to='core.content')), ('codename', models.CharField(max_length=255)), ('suite', models.CharField(max_length=255)), ('distribution', models.CharField(max_length=255)), @@ -29,9 +28,9 @@ class Migration(migrations.Migration): migrations.CreateModel( name='ReleaseComponent', fields=[ - ('content_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='deb_releasecomponent', 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='deb_releasecomponent', serialize=False, to='core.content')), ('component', models.CharField(max_length=255)), - ('release', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='deb_releasecomponent', to='deb.Release')), + ('release', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='deb_releasecomponent', to='deb.release')), ], options={ 'default_related_name': '%(app_label)s_%(model_name)s', @@ -42,9 +41,9 @@ class Migration(migrations.Migration): migrations.CreateModel( name='ReleaseArchitecture', fields=[ - ('content_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='deb_releasearchitecture', 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='deb_releasearchitecture', serialize=False, to='core.content')), ('architecture', models.CharField(max_length=255)), - ('release', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='deb_releasearchitecture', to='deb.Release')), + ('release', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='deb_releasearchitecture', to='deb.release')), ], options={ 'default_related_name': '%(app_label)s_%(model_name)s', @@ -55,9 +54,9 @@ class Migration(migrations.Migration): migrations.CreateModel( name='PackageReleaseComponent', fields=[ - ('content_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='deb_packagereleasecomponent', serialize=False, to='core.Content')), - ('package', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='deb_packagereleasecomponent', to='deb.Package')), - ('release_component', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='deb_packagereleasecomponent', to='deb.ReleaseComponent')), + ('content_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='deb_packagereleasecomponent', serialize=False, to='core.content')), + ('package', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='deb_packagereleasecomponent', to='deb.package')), + ('release_component', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='deb_packagereleasecomponent', to='deb.releasecomponent')), ], options={ 'default_related_name': '%(app_label)s_%(model_name)s', diff --git a/pulp_deb/app/migrations/0009_apt_release_signing_service.py b/pulp_deb/app/migrations/0009_apt_release_signing_service.py index aa6a240c8..59b07f317 100644 --- a/pulp_deb/app/migrations/0009_apt_release_signing_service.py +++ b/pulp_deb/app/migrations/0009_apt_release_signing_service.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.11 on 2020-03-13 12:53 +# Generated by Django 4.2.16 on 2024-12-11 16:34 from django.db import migrations, models import django.db.models.deletion @@ -7,7 +7,6 @@ class Migration(migrations.Migration): dependencies = [ - ('core', '0022_rename_last_version'), ('deb', '0008_debremote_gpgkey'), ] @@ -15,7 +14,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='AptReleaseSigningService', fields=[ - ('signingservice_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='core.SigningService')), + ('signingservice_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='core.signingservice')), ], options={ 'abstract': False, diff --git a/pulp_deb/app/migrations/0014_swap_distribution_model.py b/pulp_deb/app/migrations/0014_swap_distribution_model.py index 2ca8a45ae..4afc5c704 100644 --- a/pulp_deb/app/migrations/0014_swap_distribution_model.py +++ b/pulp_deb/app/migrations/0014_swap_distribution_model.py @@ -48,7 +48,6 @@ class Migration(migrations.Migration): atomic = False dependencies = [ - ('core', '0062_add_new_distribution_mastermodel'), ('deb', '0013_aptremote_ignore_missing_package_indices'), ]