Reset trombi's migrations

trombi/migrations/0001_initial.py

@@ -2,9 +2,9 @@
 from __future__ import unicode_literals
 
 from django.db import migrations, models
-from django.conf import settings
-import django.utils.timezone
 import django.db.models.deletion
+import django.utils.timezone
+from django.conf import settings
 
 
 class Migration(migrations.Migration):
@@ -18,36 +18,38 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Trombi',
             fields=[
-                ('id', models.AutoField(primary_key=True, verbose_name='ID', serialize=False, auto_created=True)),
-                ('subscription_deadline', models.DateField(verbose_name='subscription deadline', default=django.utils.timezone.now, help_text='Before this date, users are allowed to subscribe to this Trombi. After this date, users subscribed will be allowed to comment on each other.')),
-                ('comments_deadline', models.DateField(verbose_name='comments deadline', default=django.utils.timezone.now, help_text="After this date, users won't be able to make comments anymore")),
-                ('max_chars', models.IntegerField(verbose_name='maximum characters', default=400, help_text='maximum number of characters allowed in a comment')),
+                ('id', models.AutoField(primary_key=True, serialize=False, auto_created=True, verbose_name='ID')),
+                ('subscription_deadline', models.DateField(help_text='Before this date, users are allowed to subscribe to this Trombi. After this date, users subscribed will be allowed to comment on each other.', default=django.utils.timezone.now, verbose_name='subscription deadline')),
+                ('comments_deadline', models.DateField(help_text="After this date, users won't be able to make comments anymore.", default=django.utils.timezone.now, verbose_name='comments deadline')),
+                ('max_chars', models.IntegerField(help_text='Maximum number of characters allowed in a comment.', default=400, verbose_name='maximum characters')),
                 ('club', models.OneToOneField(to='club.Club', related_name='trombi')),
             ],
         ),
         migrations.CreateModel(
             name='TrombiComment',
             fields=[
-                ('id', models.AutoField(primary_key=True, verbose_name='ID', serialize=False, auto_created=True)),
-                ('content', models.TextField(verbose_name='content', default='')),
+                ('id', models.AutoField(primary_key=True, serialize=False, auto_created=True, verbose_name='ID')),
+                ('content', models.TextField(default='', verbose_name='content')),
             ],
         ),
         migrations.CreateModel(
             name='TrombiUser',
             fields=[
-                ('id', models.AutoField(primary_key=True, verbose_name='ID', serialize=False, auto_created=True)),
-                ('trombi', models.ForeignKey(to='trombi.Trombi', related_name='users', verbose_name='trombi', null=True, blank=True, on_delete=django.db.models.deletion.SET_NULL)),
-                ('user', models.OneToOneField(to=settings.AUTH_USER_MODEL, related_name='trombi_user', verbose_name='trombi user')),
+                ('id', models.AutoField(primary_key=True, serialize=False, auto_created=True, verbose_name='ID')),
+                ('profile_pict', models.ImageField(verbose_name='profile pict', upload_to='trombi', null=True, help_text='The profile picture you want in the trombi (warning: this picture may be published)', blank=True)),
+                ('scrub_pict', models.ImageField(verbose_name='scrub pict', upload_to='trombi', null=True, help_text='The scrub picture you want in the trombi (warning: this picture may be published)', blank=True)),
+                ('trombi', models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL, verbose_name='trombi', null=True, to='trombi.Trombi', blank=True, related_name='users')),
+                ('user', models.OneToOneField(verbose_name='trombi user', to=settings.AUTH_USER_MODEL, related_name='trombi_user')),
             ],
         ),
         migrations.AddField(
             model_name='trombicomment',
             name='author',
-            field=models.ForeignKey(to='trombi.TrombiUser', related_name='given_comments', verbose_name='author'),
+            field=models.ForeignKey(verbose_name='author', to='trombi.TrombiUser', related_name='given_comments'),
         ),
         migrations.AddField(
             model_name='trombicomment',
             name='target',
-            field=models.ForeignKey(to='trombi.TrombiUser', related_name='received_comments', verbose_name='target'),
+            field=models.ForeignKey(verbose_name='target', to='trombi.TrombiUser', related_name='received_comments'),
         ),
     ]

trombi/migrations/0002_auto_20170510_2229.py

-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('trombi', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='trombiuser',
-            name='profile_pict',
-            field=models.ImageField(null=True, blank=True, help_text='The profile picture you want in the trombi (warning: this picture may be published)', verbose_name='profile pict', upload_to='trombi'),
-        ),
-        migrations.AddField(
-            model_name='trombiuser',
-            name='scrub_pict',
-            field=models.ImageField(null=True, blank=True, help_text='The scrub picture you want in the trombi (warning: this picture may be published)', verbose_name='scrub pict', upload_to='trombi'),
-        ),
-    ]