diff options
author | Justin ! <just1602@riseup.net> | 2020-11-09 18:00:20 -0500 |
---|---|---|
committer | jelle van der Waa <jelle@vdwaa.nl> | 2020-11-11 22:23:29 +0100 |
commit | 093e4f4c1f7baf0a185abdf2afee36a06976b212 (patch) | |
tree | 9fcc06d5c5db3ee891151d82ec425ce833bbea62 | |
parent | 87977c599bcb94f5a9c8abf02dd5981b0fcb0314 (diff) | |
download | archweb-093e4f4c1f7baf0a185abdf2afee36a06976b212.tar.gz archweb-093e4f4c1f7baf0a185abdf2afee36a06976b212.zip |
Unlint more migrations
-rw-r--r-- | main/migrations/0001_initial.py | 29 | ||||
-rw-r--r-- | main/migrations/0002_repo_public_testing.py | 3 | ||||
-rw-r--r-- | mirrors/migrations/0001_squashed_0002_mirrorurl_bandwidth.py | 32 | ||||
-rw-r--r-- | news/migrations/0001_squashed_0002_news_send_announce.py | 3 | ||||
-rw-r--r-- | packages/migrations/0001_squashed_0003_auto_20170524_0704.py | 55 | ||||
-rw-r--r-- | planet/migrations/0001_initial.py | 3 | ||||
-rw-r--r-- | releng/migrations/0001_squashed_0005_auto_20180616_0947.py | 23 | ||||
-rw-r--r-- | releng/migrations/0003_release_pgp_key.py | 3 | ||||
-rw-r--r-- | todolists/migrations/0001_squashed_0002_remove_todolist_old_id.py | 12 |
9 files changed, 51 insertions, 112 deletions
diff --git a/main/migrations/0001_initial.py b/main/migrations/0001_initial.py index 6b6eec68..cf9b48f6 100644 --- a/main/migrations/0001_initial.py +++ b/main/migrations/0001_initial.py @@ -18,10 +18,8 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('name', models.CharField(unique=True, max_length=255)), - ('agnostic', models.BooleanField( - default=False, help_text='Is this architecture non-platform specific?')), - ('required_signoffs', models.PositiveIntegerField( - default=2, help_text='Number of signoffs required for packages of this architecture')), + ('agnostic', models.BooleanField(default=False, help_text='Is this architecture non-platform specific?')), + ('required_signoffs', models.PositiveIntegerField(default=2, help_text='Number of signoffs required for packages of this architecture')), ], options={ 'ordering': ('name',), @@ -35,8 +33,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('name', models.CharField(unique=True, max_length=255)), - ('visible', models.BooleanField( - default=True, help_text='Should we show this donor on the public page?')), + ('visible', models.BooleanField(default=True, help_text='Should we show this donor on the public page?')), ('created', models.DateTimeField()), ], options={ @@ -67,10 +64,8 @@ class Migration(migrations.Migration): ('packager_str', models.CharField(max_length=255, verbose_name='packager string')), ('signature_bytes', models.BinaryField(verbose_name='PGP signature', null=True)), ('flag_date', models.DateTimeField(null=True, blank=True)), - ('arch', models.ForeignKey( - related_name='packages', on_delete=django.db.models.deletion.PROTECT, to='main.Arch')), - ('packager', models.ForeignKey( - on_delete=django.db.models.deletion.SET_NULL, blank=True, to=settings.AUTH_USER_MODEL, null=True)), + ('arch', models.ForeignKey(related_name='packages', on_delete=django.db.models.deletion.PROTECT, to='main.Arch')), + ('packager', models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL, blank=True, to=settings.AUTH_USER_MODEL, null=True)), ], options={ 'ordering': ('pkgname',), @@ -100,12 +95,9 @@ class Migration(migrations.Migration): ('name', models.CharField(unique=True, max_length=255)), ('testing', models.BooleanField(default=False, help_text='Is this repo meant for package testing?')), ('staging', models.BooleanField(default=False, help_text='Is this repo meant for package staging?')), - ('bugs_project', models.SmallIntegerField( - default=1, help_text='Flyspray project ID for this repository.')), - ('bugs_category', models.SmallIntegerField( - default=2, help_text='Flyspray category ID for this repository.')), - ('svn_root', models.CharField( - help_text='SVN root (e.g. path) for this repository.', max_length=64)), + ('bugs_project', models.SmallIntegerField(default=1, help_text='Flyspray project ID for this repository.')), + ('bugs_category', models.SmallIntegerField(default=2, help_text='Flyspray category ID for this repository.')), + ('svn_root', models.CharField(help_text='SVN root (e.g. path) for this repository.', max_length=64)), ], options={ 'ordering': ('name',), @@ -116,10 +108,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='package', name='repo', - field=models.ForeignKey( - related_name='packages', - on_delete=django.db.models.deletion.PROTECT, - to='main.Repo'), + field=models.ForeignKey(related_name='packages', on_delete=django.db.models.deletion.PROTECT, to='main.Repo'), preserve_default=True, ), migrations.AlterUniqueTogether( diff --git a/main/migrations/0002_repo_public_testing.py b/main/migrations/0002_repo_public_testing.py index fc9f0f97..3f87234e 100644 --- a/main/migrations/0002_repo_public_testing.py +++ b/main/migrations/0002_repo_public_testing.py @@ -13,7 +13,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='repo', name='public_testing', - field=models.BooleanField( - default=False, help_text='Is this repo meant for package testing (without signoffs)?'), + field=models.BooleanField(default=False, help_text='Is this repo meant for package testing (without signoffs)?'), ), ] diff --git a/mirrors/migrations/0001_squashed_0002_mirrorurl_bandwidth.py b/mirrors/migrations/0001_squashed_0002_mirrorurl_bandwidth.py index 9cfc439b..1818287c 100644 --- a/mirrors/migrations/0001_squashed_0002_mirrorurl_bandwidth.py +++ b/mirrors/migrations/0001_squashed_0002_mirrorurl_bandwidth.py @@ -34,8 +34,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=255, unique=True)), - ('tier', models.SmallIntegerField( - choices=[(0, 'Tier 0'), (1, 'Tier 1'), (2, 'Tier 2'), (-1, 'Untiered')], default=2)), + ('tier', models.SmallIntegerField(choices=[(0, 'Tier 0'), (1, 'Tier 1'), (2, 'Tier 2'), (-1, 'Untiered')], default=2)), ('admin_email', models.EmailField(blank=True, max_length=255)), ('alternate_email', models.EmailField(blank=True, max_length=255)), ('public', models.BooleanField(default=True)), @@ -47,8 +46,7 @@ class Migration(migrations.Migration): ('notes', models.TextField(blank=True)), ('created', models.DateTimeField(editable=False)), ('last_modified', models.DateTimeField(editable=False)), - ('upstream', models.ForeignKey( - null=True, on_delete=django.db.models.deletion.SET_NULL, to='mirrors.Mirror')), + ('upstream', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='mirrors.Mirror')), ], options={ 'ordering': ('name',), @@ -63,9 +61,7 @@ class Migration(migrations.Migration): ('duration', models.FloatField(null=True)), ('is_success', models.BooleanField(default=True)), ('error', models.TextField(blank=True, default='')), - ('location', models.ForeignKey( - null=True, on_delete=django.db.models.deletion.CASCADE, - related_name='logs', to='mirrors.CheckLocation')), + ('location', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='logs', to='mirrors.CheckLocation')), ], options={ 'get_latest_by': 'check_time', @@ -77,10 +73,8 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('protocol', models.CharField(max_length=10, unique=True)), - ('is_download', models.BooleanField( - default=True, help_text='Is protocol useful for end-users, e.g. HTTP')), - ('default', models.BooleanField( - default=True, help_text='Included by default when building mirror list?')), + ('is_download', models.BooleanField(default=True, help_text='Is protocol useful for end-users, e.g. HTTP')), + ('default', models.BooleanField(default=True, help_text='Included by default when building mirror list?')), ('created', models.DateTimeField(editable=False)), ], options={ @@ -93,9 +87,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('ip', mirrors.fields.IPNetworkField(max_length=44, verbose_name='IP')), ('created', models.DateTimeField(editable=False)), - ('mirror', models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - related_name='rsync_ips', to='mirrors.Mirror')), + ('mirror', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rsync_ips', to='mirrors.Mirror')), ], options={ 'ordering': ('ip',), @@ -112,12 +104,8 @@ class Migration(migrations.Migration): ('has_ipv6', models.BooleanField(default=False, editable=False, verbose_name='IPv6 capable')), ('created', models.DateTimeField(editable=False)), ('active', models.BooleanField(default=True)), - ('mirror', models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - related_name='urls', to='mirrors.Mirror')), - ('protocol', models.ForeignKey( - editable=False, on_delete=django.db.models.deletion.PROTECT, - related_name='urls', to='mirrors.MirrorProtocol')), + ('mirror', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='urls', to='mirrors.Mirror')), + ('protocol', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.PROTECT, related_name='urls', to='mirrors.MirrorProtocol')), ('bandwidth', models.FloatField(blank=True, null=True, verbose_name='bandwidth (mbits)')), ], options={ @@ -127,8 +115,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='mirrorlog', name='url', - field=models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - related_name='logs', to='mirrors.MirrorUrl'), + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='logs', to='mirrors.MirrorUrl'), ), ] diff --git a/news/migrations/0001_squashed_0002_news_send_announce.py b/news/migrations/0001_squashed_0002_news_send_announce.py index 59f438c5..9250e4e4 100644 --- a/news/migrations/0001_squashed_0002_news_send_announce.py +++ b/news/migrations/0001_squashed_0002_news_send_announce.py @@ -27,8 +27,7 @@ class Migration(migrations.Migration): ('guid', models.CharField(editable=False, max_length=255)), ('content', models.TextField()), ('safe_mode', models.BooleanField(default=True)), - ('author', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, - related_name='news_author', to=settings.AUTH_USER_MODEL)), + ('author', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='news_author', to=settings.AUTH_USER_MODEL)), ('send_announce', models.BooleanField(default=True)), ], options={ diff --git a/packages/migrations/0001_squashed_0003_auto_20170524_0704.py b/packages/migrations/0001_squashed_0003_auto_20170524_0704.py index 17657307..a9131139 100644 --- a/packages/migrations/0001_squashed_0003_auto_20170524_0704.py +++ b/packages/migrations/0001_squashed_0003_auto_20170524_0704.py @@ -24,8 +24,7 @@ class Migration(migrations.Migration): ('name', models.CharField(db_index=True, max_length=255)), ('version', models.CharField(default='', max_length=255)), ('comparison', models.CharField(default='', max_length=255)), - ('pkg', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, - related_name='conflicts', to='main.Package')), + ('pkg', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='conflicts', to='main.Package')), ], options={ 'ordering': ('name',), @@ -40,11 +39,8 @@ class Migration(migrations.Migration): ('version', models.CharField(default='', max_length=255)), ('comparison', models.CharField(default='', max_length=255)), ('description', models.TextField(blank=True, null=True)), - ('deptype', models.CharField( - choices=[('D', 'Depend'), ('O', 'Optional Depend'), ('M', 'Make Depend'), ('C', 'Check Depend')], - default='D', max_length=1)), - ('pkg', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='depends', - to='main.Package')), + ('deptype', models.CharField(choices=[('D', 'Depend'), ('O', 'Optional Depend'), ('M', 'Make Depend'), ('C', 'Check Depend')], default='D', max_length=1)), + ('pkg', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='depends', to='main.Package')), ], options={ 'ordering': ('name',), @@ -65,11 +61,9 @@ class Migration(migrations.Migration): ('num_packages', models.PositiveIntegerField(default=1, verbose_name='number of packages')), ('message', models.TextField(blank=True, verbose_name='message to developer')), ('is_spam', models.BooleanField(default=False, help_text='Is this comment from a real person?')), - ('is_legitimate', models.BooleanField(default=True, - help_text='Is this actually an out-of-date flag request?')), + ('is_legitimate', models.BooleanField(default=True, help_text='Is this actually an out-of-date flag request?')), ('repo', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='main.Repo')), - ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, - to=settings.AUTH_USER_MODEL)), + ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], options={ 'get_latest_by': 'created', @@ -80,8 +74,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=255)), - ('pkg', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, - related_name='licenses', to='main.Package')), + ('pkg', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='licenses', to='main.Package')), ], options={ 'ordering': ('name',), @@ -92,8 +85,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(db_index=True, max_length=255)), - ('pkg', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, - related_name='groups', to='main.Package')), + ('pkg', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='groups', to='main.Package')), ], options={ 'ordering': ('name',), @@ -106,8 +98,7 @@ class Migration(migrations.Migration): ('pkgbase', models.CharField(max_length=255)), ('type', models.PositiveIntegerField(choices=[(1, 'Maintainer'), (2, 'Watcher')], default=1)), ('created', models.DateTimeField(editable=False)), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, - related_name='package_relations', to=settings.AUTH_USER_MODEL)), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='package_relations', to=settings.AUTH_USER_MODEL)), ], ), migrations.CreateModel( @@ -116,8 +107,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(db_index=True, max_length=255)), ('version', models.CharField(default='', max_length=255)), - ('pkg', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, - related_name='provides', to='main.Package')), + ('pkg', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='provides', to='main.Package')), ], options={ 'ordering': ('name',), @@ -131,8 +121,7 @@ class Migration(migrations.Migration): ('name', models.CharField(db_index=True, max_length=255)), ('version', models.CharField(default='', max_length=255)), ('comparison', models.CharField(default='', max_length=255)), - ('pkg', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, - related_name='replaces', to='main.Package')), + ('pkg', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='replaces', to='main.Package')), ], options={ 'ordering': ('name',), @@ -152,8 +141,7 @@ class Migration(migrations.Migration): ('comments', models.TextField(blank=True, null=True)), ('arch', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='main.Arch')), ('repo', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='main.Repo')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, - related_name='package_signoffs', to=settings.AUTH_USER_MODEL)), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='package_signoffs', to=settings.AUTH_USER_MODEL)), ], ), migrations.CreateModel( @@ -165,16 +153,13 @@ class Migration(migrations.Migration): ('pkgrel', models.CharField(max_length=255)), ('epoch', models.PositiveIntegerField(default=0)), ('created', models.DateTimeField(editable=False)), - ('required', models.PositiveIntegerField(default=2, - help_text='How many signoffs are required for this package?')), + ('required', models.PositiveIntegerField(default=2, help_text='How many signoffs are required for this package?')), ('enabled', models.BooleanField(default=True, help_text='Is this package eligible for signoffs?')), - ('known_bad', models.BooleanField(default=False, - help_text='Is this package known to be broken in some way?')), + ('known_bad', models.BooleanField(default=False, help_text='Is this package known to be broken in some way?')), ('comments', models.TextField(blank=True, null=True)), ('arch', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='main.Arch')), ('repo', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='main.Repo')), - ('user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, - to=settings.AUTH_USER_MODEL)), + ('user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], ), migrations.CreateModel( @@ -183,8 +168,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('pkgname', models.CharField(db_index=True, max_length=255)), ('pkgbase', models.CharField(max_length=255)), - ('action_flag', models.PositiveSmallIntegerField( - choices=[(1, 'Addition'), (2, 'Change'), (3, 'Deletion')], verbose_name='action flag')), + ('action_flag', models.PositiveSmallIntegerField(choices=[(1, 'Addition'), (2, 'Change'), (3, 'Deletion')], verbose_name='action flag')), ('created', models.DateTimeField(db_index=True, editable=False)), ('old_pkgver', models.CharField(max_length=255, null=True)), ('old_pkgrel', models.CharField(max_length=255, null=True)), @@ -192,12 +176,9 @@ class Migration(migrations.Migration): ('new_pkgver', models.CharField(max_length=255, null=True)), ('new_pkgrel', models.CharField(max_length=255, null=True)), ('new_epoch', models.PositiveIntegerField(null=True)), - ('arch', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, - related_name='updates', to='main.Arch')), - ('package', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, - related_name='updates', to='main.Package')), - ('repo', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, - related_name='updates', to='main.Repo')), + ('arch', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='updates', to='main.Arch')), + ('package', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='updates', to='main.Package')), + ('repo', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='updates', to='main.Repo')), ], options={ 'get_latest_by': 'created', diff --git a/planet/migrations/0001_initial.py b/planet/migrations/0001_initial.py index a7592cef..948b2532 100644 --- a/planet/migrations/0001_initial.py +++ b/planet/migrations/0001_initial.py @@ -50,8 +50,7 @@ class Migration(migrations.Migration): ('author', models.CharField(max_length=255)), ('publishdate', models.DateTimeField(db_index=True, verbose_name='publish date')), ('url', models.CharField(max_length=255, verbose_name='URL')), - ('feed', models.ForeignKey( - null=True, on_delete=django.db.models.deletion.CASCADE, related_name='feed', to='planet.Feed')), + ('feed', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='feed', to='planet.Feed')), ], options={ 'verbose_name_plural': 'Feed Items', diff --git a/releng/migrations/0001_squashed_0005_auto_20180616_0947.py b/releng/migrations/0001_squashed_0005_auto_20180616_0947.py index 4269ebf4..76f10f60 100644 --- a/releng/migrations/0001_squashed_0005_auto_20180616_0947.py +++ b/releng/migrations/0001_squashed_0005_auto_20180616_0947.py @@ -16,7 +16,6 @@ def release_populate_last_modified_forwards(apps, schema_editor): Release = apps.get_model('releng', 'Release') Release.objects.update(last_modified=models.F('created')) - def release_populate_last_modified_backwards(apps, schema_editor): pass @@ -145,8 +144,7 @@ class Migration(migrations.Migration): ('available', models.BooleanField(default=True)), ('info', models.TextField(blank=True, verbose_name='Public information')), ('torrent_data', models.TextField(blank=True, help_text='base64-encoded torrent file')), - ('last_modified', models.DateTimeField(default=datetime.datetime(2001, 1, 1, 0, 0, - tzinfo=utc), editable=False)), + ('last_modified', models.DateTimeField(default=datetime.datetime(2001, 1, 1, 0, 0, tzinfo=utc), editable=False)), ], options={ 'ordering': ('-release_date', '-version'), @@ -173,25 +171,18 @@ class Migration(migrations.Migration): ('created', models.DateTimeField(editable=False)), ('success', models.BooleanField(default=True)), ('comments', models.TextField(blank=True, null=True)), - ('architecture', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, - to='releng.Architecture')), + ('architecture', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='releng.Architecture')), ('boot_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='releng.BootType')), ('bootloader', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='releng.Bootloader')), - ('clock_choice', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, - to='releng.ClockChoice')), + ('clock_choice', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='releng.ClockChoice')), ('filesystem', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='releng.Filesystem')), - ('hardware_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, - to='releng.HardwareType')), - ('install_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, - to='releng.InstallType')), + ('hardware_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='releng.HardwareType')), + ('install_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='releng.InstallType')), ('iso', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='releng.Iso')), ('iso_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='releng.IsoType')), ('modules', models.ManyToManyField(blank=True, null=True, to='releng.Module')), - ('rollback_filesystem', models.ForeignKey(blank=True, null=True, - on_delete=django.db.models.deletion.CASCADE, - related_name='rollback_test_set', to='releng.Filesystem')), - ('rollback_modules', models.ManyToManyField(blank=True, null=True, related_name='rollback_test_set', - to='releng.Module')), + ('rollback_filesystem', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='rollback_test_set', to='releng.Filesystem')), + ('rollback_modules', models.ManyToManyField(blank=True, null=True, related_name='rollback_test_set', to='releng.Module')), ('source', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='releng.Source')), ], ), diff --git a/releng/migrations/0003_release_pgp_key.py b/releng/migrations/0003_release_pgp_key.py index 3ff103c6..a211a798 100644 --- a/releng/migrations/0003_release_pgp_key.py +++ b/releng/migrations/0003_release_pgp_key.py @@ -14,7 +14,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='release', name='pgp_key', - field=devel.fields.PGPKeyField(blank=True, help_text='consists of 40 hex digits; use `gpg --fingerprint`', - max_length=40, null=True, verbose_name='PGP key fingerprint'), + field=devel.fields.PGPKeyField(blank=True, help_text='consists of 40 hex digits; use `gpg --fingerprint`', max_length=40, null=True, verbose_name='PGP key fingerprint'), ), ] diff --git a/todolists/migrations/0001_squashed_0002_remove_todolist_old_id.py b/todolists/migrations/0001_squashed_0002_remove_todolist_old_id.py index 5c12b504..4acb0fe5 100644 --- a/todolists/migrations/0001_squashed_0002_remove_todolist_old_id.py +++ b/todolists/migrations/0001_squashed_0002_remove_todolist_old_id.py @@ -28,8 +28,7 @@ class Migration(migrations.Migration): ('created', models.DateTimeField(db_index=True)), ('last_modified', models.DateTimeField(editable=False)), ('raw', models.TextField(blank=True)), - ('creator', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, - related_name='created_todolists', to=settings.AUTH_USER_MODEL)), + ('creator', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='created_todolists', to=settings.AUTH_USER_MODEL)), ], options={ 'get_latest_by': 'created', @@ -38,22 +37,19 @@ class Migration(migrations.Migration): migrations.CreateModel( name='TodolistPackage', fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, - serialize=False, verbose_name='ID')), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('pkgname', models.CharField(max_length=255)), ('pkgbase', models.CharField(max_length=255)), ('created', models.DateTimeField(editable=False)), ('last_modified', models.DateTimeField(editable=False)), ('removed', models.DateTimeField(blank=True, null=True)), - ('status', models.SmallIntegerField( - choices=[(0, 'Incomplete'), (1, 'Complete'), (2, 'In-progress')], default=0)), + ('status', models.SmallIntegerField(choices=[(0, 'Incomplete'), (1, 'Complete'), (2, 'In-progress')], default=0)), ('comments', models.TextField(blank=True, null=True)), ('arch', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='main.Arch')), ('pkg', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='main.Package')), ('repo', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='main.Repo')), ('todolist', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='todolists.Todolist')), - ('user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, - to=settings.AUTH_USER_MODEL)), + ('user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)), ], options={ 'get_latest_by': 'created', |