Skip to content

Commit 27db94f

Browse files
committed
Rebase migrations in preparation for pulpcore 3.70.
closes #3828.
1 parent 5d3d35c commit 27db94f

File tree

7 files changed

+47
-62
lines changed

7 files changed

+47
-62
lines changed

CHANGES/3828.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Ensure migrations depending on core, depend on core/0091 or later.

pulp_rpm/app/migrations/0001_initial.py

Lines changed: 31 additions & 31 deletions
Large diffs are not rendered by default.
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated by Django 2.2.10 on 2020-02-28 18:40
1+
# Generated by Django 4.2.17 on 2024-12-05 18:54
22

33
from django.db import migrations, models
44
import django.db.models.deletion
@@ -7,14 +7,13 @@
77
class Migration(migrations.Migration):
88

99
dependencies = [
10-
('core', '0022_rename_last_version'),
1110
('rpm', '0003_DATA_incorrect_json'),
1211
]
1312

1413
operations = [
1514
migrations.AddField(
1615
model_name='rpmrepository',
1716
name='metadata_signing_service',
18-
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='rpm_rpmrepository', to='core.AsciiArmoredDetachedSigningService'),
17+
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='rpm_rpmrepository', to='core.asciiarmoreddetachedsigningservice'),
1918
),
2019
]

pulp_rpm/app/migrations/0005_optimize_sync.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated by Django 2.2.10 on 2020-03-18 14:23
1+
# Generated by Django 4.2.17 on 2024-12-05 18:54
22

33
from django.db import migrations, models
44
import django.db.models.deletion
@@ -7,15 +7,14 @@
77
class Migration(migrations.Migration):
88

99
dependencies = [
10-
('core', '0022_rename_last_version'),
1110
('rpm', '0004_add_metadata_signing_service_fk'),
1211
]
1312

1413
operations = [
1514
migrations.AddField(
1615
model_name='rpmrepository',
1716
name='last_sync_remote',
18-
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='rpm_rpmrepository', to='core.Remote'),
17+
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='rpm_rpmrepository', to='core.remote'),
1918
),
2019
migrations.AddField(
2120
model_name='rpmrepository',

pulp_rpm/app/migrations/0032_ulnremote.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated by Django 2.2.19 on 2021-03-18 16:30
1+
# Generated by Django 4.2.17 on 2024-12-05 18:54
22

33
from django.db import migrations, models
44
import django.db.models.deletion
@@ -7,15 +7,14 @@
77
class Migration(migrations.Migration):
88

99
dependencies = [
10-
('core', '0061_call_handle_artifact_checksums_command'),
1110
('rpm', '0031_modulemd_static_context'),
1211
]
1312

1413
operations = [
1514
migrations.CreateModel(
1615
name='UlnRemote',
1716
fields=[
18-
('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')),
17+
('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')),
1918
('uln_server_base_url', models.CharField(max_length=512, null=True)),
2019
],
2120
options={

pulp_rpm/app/migrations/0033_new_distribution_model.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Generated by Django 2.2.19 on 2021-03-19 17:42
1+
# Generated by Django 4.2.17 on 2024-12-05 18:54
22

3-
from django.db import connection, migrations, models, transaction
3+
from django.db import migrations, models, transaction
44
import django.db.models.deletion
55

66

@@ -48,15 +48,14 @@ class Migration(migrations.Migration):
4848
atomic = False
4949

5050
dependencies = [
51-
('core', '0062_add_new_distribution_mastermodel'),
5251
('rpm', '0032_ulnremote'),
5352
]
5453

5554
operations = [
5655
migrations.CreateModel(
5756
name='NewRpmDistribution',
5857
fields=[
59-
('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')),
58+
('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')),
6059
],
6160
options={
6261
'default_related_name': '%(app_label)s_%(model_name)s',
Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated by Django 3.2.7 on 2021-09-17 10:47
1+
# Generated by Django 4.2.17 on 2024-12-05 18:54
22

33
from django.db import migrations, models
44
import django.db.models.deletion
@@ -7,30 +7,18 @@
77
class Migration(migrations.Migration):
88

99
dependencies = [
10-
("core", "0076_remove_reserved_resource"),
11-
("rpm", "0039_disttree_digest"),
10+
('rpm', '0039_disttree_digest'),
1211
]
1312

1413
operations = [
1514
migrations.CreateModel(
16-
name="RpmAlternateContentSource",
15+
name='RpmAlternateContentSource',
1716
fields=[
18-
(
19-
"alternatecontentsource_ptr",
20-
models.OneToOneField(
21-
auto_created=True,
22-
on_delete=django.db.models.deletion.CASCADE,
23-
parent_link=True,
24-
primary_key=True,
25-
related_name="rpm_rpmalternatecontentsource",
26-
serialize=False,
27-
to="core.alternatecontentsource",
28-
),
29-
),
17+
('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')),
3018
],
3119
options={
32-
"default_related_name": "%(app_label)s_%(model_name)s",
20+
'default_related_name': '%(app_label)s_%(model_name)s',
3321
},
34-
bases=("core.alternatecontentsource",),
22+
bases=('core.alternatecontentsource',),
3523
),
3624
]

0 commit comments

Comments
 (0)