Skip to content

Commit 18dab98

Browse files
gerrod3gerrod3
committed
Rebase migrations to core/0091
fixes: #1850
1 parent bf5c789 commit 18dab98

13 files changed

+41
-46
lines changed

‎CHANGES/1850.removal

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Rebased and squashed old migrations to prepare for pulpcore 3.70 compatibility.

‎pulp_container/app/migrations/0001_initial.py

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated by Django 2.2.7 on 2019-11-08 12:23
1+
# Generated by Django 4.2.16 on 2025-01-14 20:23
22

33
import django.contrib.postgres.fields
44
from django.db import migrations, models
@@ -10,14 +10,14 @@ class Migration(migrations.Migration):
1010
initial = True
1111

1212
dependencies = [
13-
('core', '0012_auto_20191104_2000'),
13+
('core', '0091_systemid'),
1414
]
1515

1616
operations = [
1717
migrations.CreateModel(
1818
name='Blob',
1919
fields=[
20-
('content_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='container_blob', serialize=False, to='core.Content')),
20+
('content_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='container_blob', serialize=False, to='core.content')),
2121
('digest', models.CharField(db_index=True, max_length=255)),
2222
('media_type', models.CharField(choices=[('application/vnd.docker.container.image.v1+json', 'application/vnd.docker.container.image.v1+json'), ('application/vnd.docker.image.rootfs.diff.tar.gzip', 'application/vnd.docker.image.rootfs.diff.tar.gzip'), ('application/vnd.docker.image.rootfs.foreign.diff.tar.gzip', 'application/vnd.docker.image.rootfs.foreign.diff.tar.gzip')], max_length=80)),
2323
],
@@ -36,7 +36,7 @@ class Migration(migrations.Migration):
3636
migrations.CreateModel(
3737
name='ContainerRemote',
3838
fields=[
39-
('remote_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='container_containerremote', serialize=False, to='core.Remote')),
39+
('remote_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='container_containerremote', serialize=False, to='core.remote')),
4040
('upstream_name', models.CharField(db_index=True, max_length=255)),
4141
('include_foreign_layers', models.BooleanField(default=False)),
4242
('whitelist_tags', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=255, null=True), null=True, size=None)),
@@ -49,12 +49,12 @@ class Migration(migrations.Migration):
4949
migrations.CreateModel(
5050
name='Manifest',
5151
fields=[
52-
('content_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='container_manifest', serialize=False, to='core.Content')),
52+
('content_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='container_manifest', serialize=False, to='core.content')),
5353
('digest', models.CharField(db_index=True, max_length=255)),
5454
('schema_version', models.IntegerField()),
5555
('media_type', models.CharField(choices=[('application/vnd.docker.distribution.manifest.v1+json', 'application/vnd.docker.distribution.manifest.v1+json'), ('application/vnd.docker.distribution.manifest.v2+json', 'application/vnd.docker.distribution.manifest.v2+json'), ('application/vnd.docker.distribution.manifest.list.v2+json', 'application/vnd.docker.distribution.manifest.list.v2+json')], max_length=60)),
56-
('blobs', models.ManyToManyField(related_name='container_manifest', through='container.BlobManifest', to='container.Blob')),
57-
('config_blob', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='config_blob', to='container.Blob')),
56+
('blobs', models.ManyToManyField(related_name='container_manifest', through='container.BlobManifest', to='container.blob')),
57+
('config_blob', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='config_blob', to='container.blob')),
5858
],
5959
options={
6060
'default_related_name': '%(app_label)s_%(model_name)s',
@@ -71,8 +71,8 @@ class Migration(migrations.Migration):
7171
('os_features', models.TextField(blank=True, default='')),
7272
('features', models.TextField(blank=True, default='')),
7373
('variant', models.CharField(blank=True, default='', max_length=255)),
74-
('image_manifest', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='image_manifests', to='container.Manifest')),
75-
('manifest_list', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='manifest_lists', to='container.Manifest')),
74+
('image_manifest', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='image_manifests', to='container.manifest')),
75+
('manifest_list', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='manifest_lists', to='container.manifest')),
7676
],
7777
options={
7878
'unique_together': {('image_manifest', 'manifest_list')},
@@ -81,14 +81,14 @@ class Migration(migrations.Migration):
8181
migrations.AddField(
8282
model_name='manifest',
8383
name='listed_manifests',
84-
field=models.ManyToManyField(related_name='container_manifest', through='container.ManifestListManifest', to='container.Manifest'),
84+
field=models.ManyToManyField(related_name='container_manifest', through='container.ManifestListManifest', to='container.manifest'),
8585
),
8686
migrations.CreateModel(
8787
name='ContainerDistribution',
8888
fields=[
89-
('basedistribution_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='container_containerdistribution', serialize=False, to='core.BaseDistribution')),
90-
('repository', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='container_containerdistribution', to='core.Repository')),
91-
('repository_version', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='container_containerdistribution', to='core.RepositoryVersion')),
89+
('basedistribution_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='container_containerdistribution', serialize=False, to='core.basedistribution')),
90+
('repository', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='container_containerdistribution', to='core.repository')),
91+
('repository_version', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='container_containerdistribution', to='core.repositoryversion')),
9292
],
9393
options={
9494
'default_related_name': '%(app_label)s_%(model_name)s',
@@ -98,19 +98,19 @@ class Migration(migrations.Migration):
9898
migrations.AddField(
9999
model_name='blobmanifest',
100100
name='manifest',
101-
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='blob_manifests', to='container.Manifest'),
101+
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='blob_manifests', to='container.manifest'),
102102
),
103103
migrations.AddField(
104104
model_name='blobmanifest',
105105
name='manifest_blob',
106-
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='manifest_blobs', to='container.Blob'),
106+
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='manifest_blobs', to='container.blob'),
107107
),
108108
migrations.CreateModel(
109109
name='Tag',
110110
fields=[
111-
('content_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='container_tag', serialize=False, to='core.Content')),
111+
('content_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='container_tag', serialize=False, to='core.content')),
112112
('name', models.CharField(db_index=True, max_length=255)),
113-
('tagged_manifest', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='tagged_manifests', to='container.Manifest')),
113+
('tagged_manifest', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='tagged_manifests', to='container.manifest')),
114114
],
115115
options={
116116
'default_related_name': '%(app_label)s_%(model_name)s',

‎pulp_container/app/migrations/0002_containerrepository.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.6 on 2019-11-04 16:21
1+
# Generated by Django 4.2.16 on 2025-01-14 20:23
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', '0011_relative_path'),
1110
('container', '0001_initial'),
1211
]
1312

1413
operations = [
1514
migrations.CreateModel(
1615
name='ContainerRepository',
1716
fields=[
18-
('repository_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='container_containerrepository', serialize=False, to='core.Repository')),
17+
('repository_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='container_containerrepository', serialize=False, to='core.repository')),
1918
],
2019
options={
2120
'default_related_name': '%(app_label)s_%(model_name)s',

‎pulp_container/app/migrations/0004_upload.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.12 on 2020-06-03 20:44
1+
# Generated by Django 4.2.16 on 2025-01-14 20:23
22

33
import django.core.files.storage
44
from django.db import migrations, models
@@ -10,7 +10,6 @@
1010
class Migration(migrations.Migration):
1111

1212
dependencies = [
13-
('core', '0032_export_to_chunks'),
1413
('container', '0003_oci_mediatype'),
1514
]
1615

@@ -30,7 +29,7 @@ class Migration(migrations.Migration):
3029
('sha256', models.CharField(max_length=64, null=True)),
3130
('sha384', models.CharField(max_length=96, null=True)),
3231
('sha512', models.CharField(max_length=128, null=True)),
33-
('repository', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='uploads', to='core.Repository')),
32+
('repository', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='uploads', to='core.repository')),
3433
],
3534
options={
3635
'abstract': False,

‎pulp_container/app/migrations/0005_contentredirectcontentguard.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
# Generated by Django 2.2.12 on 2020-06-25 08:23
1+
# Generated by Django 4.2.16 on 2025-01-14 20:23
22

33
import os
44

55
from django.db import migrations, models
66
import django.db.models.deletion
7-
import pulp_container.app.models
87

98

109
def _gen_secret():
@@ -14,15 +13,14 @@ def _gen_secret():
1413
class Migration(migrations.Migration):
1514

1615
dependencies = [
17-
('core', '0033_increase_remote_artifact_size_field'),
1816
('container', '0004_upload'),
1917
]
2018

2119
operations = [
2220
migrations.CreateModel(
2321
name='ContentRedirectContentGuard',
2422
fields=[
25-
('contentguard_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='container_contentredirectcontentguard', serialize=False, to='core.ContentGuard')),
23+
('contentguard_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='container_contentredirectcontentguard', serialize=False, to='core.contentguard')),
2624
('shared_secret', models.BinaryField(default=_gen_secret, max_length=32)),
2725
],
2826
options={

‎pulp_container/app/migrations/0006_containerpushrepository.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.12 on 2020-06-26 17:08
1+
# Generated by Django 4.2.16 on 2025-01-14 20:23
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', '0033_increase_remote_artifact_size_field'),
1110
('container', '0005_contentredirectcontentguard'),
1211
]
1312

1413
operations = [
1514
migrations.CreateModel(
1615
name='ContainerPushRepository',
1716
fields=[
18-
('repository_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='container_containerpushrepository', serialize=False, to='core.Repository')),
17+
('repository_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='container_containerpushrepository', serialize=False, to='core.repository')),
1918
],
2019
options={
2120
'default_related_name': '%(app_label)s_%(model_name)s',

‎pulp_container/app/migrations/0007_clear_tags_artifacts_refs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ class Migration(migrations.Migration):
2323
]
2424

2525
operations = [
26-
migrations.RunPython(remove_tag_artifacts_up, remove_tag_artifacts_down)
26+
migrations.RunPython(remove_tag_artifacts_up, remove_tag_artifacts_down, elidable=True)
2727
]

‎pulp_container/app/migrations/0009_container_namespace.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,7 @@ class Migration(migrations.Migration):
4444
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='container_distributions', to='container.ContainerNamespace'),
4545
),
4646
# Reverting that step is simply removing the new relation and table.
47-
migrations.RunPython(initialize_namespaces, reverse_code=migrations.RunPython.noop),
47+
migrations.RunPython(
48+
initialize_namespaces, reverse_code=migrations.RunPython.noop, elidable=True
49+
),
4850
]

‎pulp_container/app/migrations/0010_remove_uploadchunk.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.17 on 2020-11-13 12:16
1+
# Generated by Django 4.2.16 on 2025-01-14 20:23
22

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

99
dependencies = [
10-
('core', '0049_add_file_field_to_uploadchunk'),
1110
('container', '0009_container_namespace'),
1211
]
1312

@@ -63,7 +62,7 @@ class Migration(migrations.Migration):
6362
migrations.AddField(
6463
model_name='upload',
6564
name='upload_ptr',
66-
field=models.OneToOneField(auto_created=True, default=None, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='core.Upload'),
65+
field=models.OneToOneField(auto_created=True, default=None, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='core.upload'),
6766
preserve_default=False,
6867
),
6968
]

‎pulp_container/app/migrations/0019_DATA_distribution_model_swap.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Generated by Django 4.2.16 on 2025-01-14 20:23
2+
13
from django.db import migrations, models, transaction
24
import django.db.models.deletion
35

@@ -51,31 +53,30 @@ def migrate_data_from_old_model_to_new_model_down(apps, schema_editor):
5153

5254

5355
class Migration(migrations.Migration):
54-
atomic = False
5556

5657
dependencies = [
57-
('core', '0062_add_new_distribution_mastermodel'),
5858
('container', '0018_containerdistribution_description'),
5959
]
6060

6161
operations = [
6262
migrations.CreateModel(
6363
name='NewContainerDistribution',
6464
fields=[
65-
('distribution_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='container_containerdistribution', serialize=False, to='core.Distribution')),
65+
('distribution_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='container_containerdistribution', serialize=False, to='core.distribution')),
6666
('private', models.BooleanField(default=False, help_text='Restrict pull access to explicitly authorized users. Defaults to unrestricted pull access.')),
67-
('namespace', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='container_distributions', to='container.ContainerNamespace')),
68-
('description', models.TextField(null=True))
67+
('namespace', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='container_distributions', to='container.containernamespace')),
68+
('description', models.TextField(null=True)),
6969
],
7070
options={
7171
'default_related_name': '%(app_label)s_%(model_name)s',
72-
'permissions': [('pull_containerdistribution', 'Can pull from a registry repo'), ('push_containerdistribution', 'Can push into the registry repo')]
72+
'permissions': [('pull_containerdistribution', 'Can pull from a registry repo'), ('push_containerdistribution', 'Can push into the registry repo')],
7373
},
7474
bases=('core.distribution',),
7575
),
7676
migrations.RunPython(
7777
code=migrate_data_from_old_model_to_new_model_up,
7878
reverse_code=migrate_data_from_old_model_to_new_model_down,
79+
elidable=True,
7980
),
8081
migrations.DeleteModel(
8182
name='ContainerDistribution',

‎pulp_container/app/migrations/0021_data_move_redirect_content_guard_to_core.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated by Django 3.2.11 on 2022-01-31 13:22
1+
# Generated by Django 4.2.16 on 2025-01-14 20:23
22

33
from django.db import migrations, transaction
44

@@ -38,7 +38,6 @@ class Migration(migrations.Migration):
3838

3939
dependencies = [
4040
('container', '0020_update_push_repo_perms'),
41-
('core', '0085_contentredirectcontentguard'),
4241
]
4342

4443
operations = [

‎pulp_container/app/migrations/0022_delete_contentredirectcontentguard.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
# Generated by Django 3.2.9 on 2022-01-31 17:51
1+
# Generated by Django 4.2.16 on 2025-01-14 20:23
22

33
from django.db import migrations
44

55

66
class Migration(migrations.Migration):
77

88
dependencies = [
9-
('core', '0085_contentredirectcontentguard'),
109
('container', '0021_data_move_redirect_content_guard_to_core'),
1110
]
1211

‎pulp_container/app/migrations/0027_data_translate_perms_to_roles.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,6 @@ class Migration(migrations.Migration):
237237
if global_apps.is_installed('guardian'):
238238
dependencies.extend([
239239
('guardian', '0002_generic_permissions_index'),
240-
('core', '0080_proxy_group_model'),
241240
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
242241
('auth', '0012_alter_user_first_name_max_length'),
243242
('contenttypes', '0002_remove_content_type_name'),

0 commit comments

Comments
 (0)