From ab4a93c64c22391e9ef5d1eb16c1c98db6a57d10 Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Wed, 6 Feb 2019 20:19:54 +0100 Subject: Update migrations for py3 unicode Need to change old migrations not to indicate we need new ones. --- pgcommitfest/commitfest/migrations/0001_initial.py | 10 +++++----- pgcommitfest/commitfest/migrations/0003_withdrawn_status.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'pgcommitfest/commitfest') diff --git a/pgcommitfest/commitfest/migrations/0001_initial.py b/pgcommitfest/commitfest/migrations/0001_initial.py index 460bcc4..39a382a 100644 --- a/pgcommitfest/commitfest/migrations/0001_initial.py +++ b/pgcommitfest/commitfest/migrations/0001_initial.py @@ -19,7 +19,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=100)), - ('status', models.IntegerField(default=1, choices=[(1, b'Future'), (2, b'Open'), (3, b'In Progress'), (4, b'Closed')])), + ('status', models.IntegerField(default=1, choices=[(1, 'Future'), (2, 'Open'), (3, 'In Progress'), (4, 'Closed')])), ('startdate', models.DateField(null=True, blank=True)), ('enddate', models.DateField(null=True, blank=True)), ], @@ -92,9 +92,9 @@ class Migration(migrations.Migration): name='Patch', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('name', models.CharField(max_length=500, verbose_name=b'Description')), - ('wikilink', models.URLField(default=b'', null=False, blank=True)), - ('gitlink', models.URLField(default=b'', null=False, blank=True)), + ('name', models.CharField(max_length=500, verbose_name='Description')), + ('wikilink', models.URLField(default='', null=False, blank=True)), + ('gitlink', models.URLField(default='', null=False, blank=True)), ('created', models.DateTimeField(auto_now_add=True)), ('modified', models.DateTimeField()), ('lastmail', models.DateTimeField(null=True, blank=True)), @@ -124,7 +124,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('enterdate', models.DateTimeField()), ('leavedate', models.DateTimeField(null=True, blank=True)), - ('status', models.IntegerField(default=1, choices=[(1, b'Needs review'), (2, b'Waiting on Author'), (3, b'Ready for Committer'), (4, b'Committed'), (5, b'Moved to next CF'), (6, b'Rejected'), (7, b'Returned with feedback')])), + ('status', models.IntegerField(default=1, choices=[(1, 'Needs review'), (2, 'Waiting on Author'), (3, 'Ready for Committer'), (4, 'Committed'), (5, 'Moved to next CF'), (6, 'Rejected'), (7, 'Returned with feedback')])), ('commitfest', models.ForeignKey(to='commitfest.CommitFest')), ('patch', models.ForeignKey(to='commitfest.Patch')), ], diff --git a/pgcommitfest/commitfest/migrations/0003_withdrawn_status.py b/pgcommitfest/commitfest/migrations/0003_withdrawn_status.py index fa61fe3..e6cdea9 100644 --- a/pgcommitfest/commitfest/migrations/0003_withdrawn_status.py +++ b/pgcommitfest/commitfest/migrations/0003_withdrawn_status.py @@ -14,7 +14,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='patchoncommitfest', name='status', - field=models.IntegerField(default=1, choices=[(1, b'Needs review'), (2, b'Waiting on Author'), (3, b'Ready for Committer'), (4, b'Committed'), (5, b'Moved to next CF'), (6, b'Rejected'), (7, b'Returned with feedback'), (8, b'Withdrawn')]), + field=models.IntegerField(default=1, choices=[(1, 'Needs review'), (2, 'Waiting on Author'), (3, 'Ready for Committer'), (4, 'Committed'), (5, 'Moved to next CF'), (6, 'Rejected'), (7, 'Returned with feedback'), (8, 'Withdrawn')]), ), migrations.RunSQL(""" INSERT INTO commitfest_patchstatus (status, statusstring, sortkey) VALUES -- cgit v1.2.3