Skip to content

Commit

Permalink
Rebase migrations in preparation for pulpcore 3.70.
Browse files Browse the repository at this point in the history
closes #3828.
  • Loading branch information
ggainey committed Dec 9, 2024
1 parent 5d3d35c commit 27db94f
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 62 deletions.
1 change: 1 addition & 0 deletions CHANGES/3828.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Ensure migrations depending on core, depend on core/0091 or later.
62 changes: 31 additions & 31 deletions pulp_rpm/app/migrations/0001_initial.py

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 2.2.10 on 2020-02-28 18:40
# Generated by Django 4.2.17 on 2024-12-05 18:54

from django.db import migrations, models
import django.db.models.deletion
Expand All @@ -7,14 +7,13 @@
class Migration(migrations.Migration):

dependencies = [
('core', '0022_rename_last_version'),
('rpm', '0003_DATA_incorrect_json'),
]

operations = [
migrations.AddField(
model_name='rpmrepository',
name='metadata_signing_service',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='rpm_rpmrepository', to='core.AsciiArmoredDetachedSigningService'),
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='rpm_rpmrepository', to='core.asciiarmoreddetachedsigningservice'),
),
]
5 changes: 2 additions & 3 deletions pulp_rpm/app/migrations/0005_optimize_sync.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 2.2.10 on 2020-03-18 14:23
# Generated by Django 4.2.17 on 2024-12-05 18:54

from django.db import migrations, models
import django.db.models.deletion
Expand All @@ -7,15 +7,14 @@
class Migration(migrations.Migration):

dependencies = [
('core', '0022_rename_last_version'),
('rpm', '0004_add_metadata_signing_service_fk'),
]

operations = [
migrations.AddField(
model_name='rpmrepository',
name='last_sync_remote',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='rpm_rpmrepository', to='core.Remote'),
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='rpm_rpmrepository', to='core.remote'),
),
migrations.AddField(
model_name='rpmrepository',
Expand Down
5 changes: 2 additions & 3 deletions pulp_rpm/app/migrations/0032_ulnremote.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 2.2.19 on 2021-03-18 16:30
# Generated by Django 4.2.17 on 2024-12-05 18:54

from django.db import migrations, models
import django.db.models.deletion
Expand All @@ -7,15 +7,14 @@
class Migration(migrations.Migration):

dependencies = [
('core', '0061_call_handle_artifact_checksums_command'),
('rpm', '0031_modulemd_static_context'),
]

operations = [
migrations.CreateModel(
name='UlnRemote',
fields=[
('remote_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='rpm_ulnremote', 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='rpm_ulnremote', serialize=False, to='core.remote')),
('uln_server_base_url', models.CharField(max_length=512, null=True)),
],
options={
Expand Down
7 changes: 3 additions & 4 deletions pulp_rpm/app/migrations/0033_new_distribution_model.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by Django 2.2.19 on 2021-03-19 17:42
# Generated by Django 4.2.17 on 2024-12-05 18:54

from django.db import connection, migrations, models, transaction
from django.db import migrations, models, transaction
import django.db.models.deletion


Expand Down Expand Up @@ -48,15 +48,14 @@ class Migration(migrations.Migration):
atomic = False

dependencies = [
('core', '0062_add_new_distribution_mastermodel'),
('rpm', '0032_ulnremote'),
]

operations = [
migrations.CreateModel(
name='NewRpmDistribution',
fields=[
('distribution_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='rpm_rpmdistribution', serialize=False, to='core.Distribution')),
('distribution_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='rpm_rpmdistribution', serialize=False, to='core.distribution')),
],
options={
'default_related_name': '%(app_label)s_%(model_name)s',
Expand Down
24 changes: 6 additions & 18 deletions pulp_rpm/app/migrations/0040_rpmalternatecontentsource.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 3.2.7 on 2021-09-17 10:47
# Generated by Django 4.2.17 on 2024-12-05 18:54

from django.db import migrations, models
import django.db.models.deletion
Expand All @@ -7,30 +7,18 @@
class Migration(migrations.Migration):

dependencies = [
("core", "0076_remove_reserved_resource"),
("rpm", "0039_disttree_digest"),
('rpm', '0039_disttree_digest'),
]

operations = [
migrations.CreateModel(
name="RpmAlternateContentSource",
name='RpmAlternateContentSource',
fields=[
(
"alternatecontentsource_ptr",
models.OneToOneField(
auto_created=True,
on_delete=django.db.models.deletion.CASCADE,
parent_link=True,
primary_key=True,
related_name="rpm_rpmalternatecontentsource",
serialize=False,
to="core.alternatecontentsource",
),
),
('alternatecontentsource_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='rpm_rpmalternatecontentsource', serialize=False, to='core.alternatecontentsource')),
],
options={
"default_related_name": "%(app_label)s_%(model_name)s",
'default_related_name': '%(app_label)s_%(model_name)s',
},
bases=("core.alternatecontentsource",),
bases=('core.alternatecontentsource',),
),
]

0 comments on commit 27db94f

Please sign in to comment.