From 61127a0770f05a75313b1e67915a50cfcfba203e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lie=20Bouttier?= Date: Mon, 15 Jun 2015 18:49:38 +0200 Subject: [PATCH] squash migrations --- accounts/migrations/0001_initial.py | 2 +- ...614_1913.py => 0002_auto_20160615_0949.py} | 6 ++-- conversations/migrations/0001_initial.py | 9 +++--- .../0002_conversationabouttalk_talk.py | 2 +- .../migrations/0003_auto_20160614_2046.py | 30 ------------------- proposals/migrations/0001_initial.py | 4 +-- 6 files changed, 11 insertions(+), 42 deletions(-) rename accounts/migrations/{0002_auto_20160614_1913.py => 0002_auto_20160615_0949.py} (96%) delete mode 100644 conversations/migrations/0003_auto_20160614_2046.py diff --git a/accounts/migrations/0001_initial.py b/accounts/migrations/0001_initial.py index c4978e8..b5a8e0f 100644 --- a/accounts/migrations/0001_initial.py +++ b/accounts/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-06-14 19:13 +# Generated by Django 1.9.7 on 2016-06-15 09:49 from __future__ import unicode_literals import accounts.utils diff --git a/accounts/migrations/0002_auto_20160614_1913.py b/accounts/migrations/0002_auto_20160615_0949.py similarity index 96% rename from accounts/migrations/0002_auto_20160614_1913.py rename to accounts/migrations/0002_auto_20160615_0949.py index 7601f21..c7a61a2 100644 --- a/accounts/migrations/0002_auto_20160614_1913.py +++ b/accounts/migrations/0002_auto_20160615_0949.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-06-14 19:13 +# Generated by Django 1.9.7 on 2016-06-15 09:49 from __future__ import unicode_literals from django.conf import settings @@ -12,10 +12,10 @@ class Migration(migrations.Migration): initial = True dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('proposals', '0001_initial'), - ('accounts', '0001_initial'), ('sites', '0002_alter_domain_unique'), + ('accounts', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ diff --git a/conversations/migrations/0001_initial.py b/conversations/migrations/0001_initial.py index a04f99e..59949b7 100644 --- a/conversations/migrations/0001_initial.py +++ b/conversations/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-06-14 19:13 +# Generated by Django 1.9.7 on 2016-06-15 09:49 from __future__ import unicode_literals import conversations.utils @@ -13,8 +13,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('accounts', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('contenttypes', '0002_remove_content_type_name'), ] @@ -23,7 +23,7 @@ class Migration(migrations.Migration): name='ConversationAboutTalk', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('subscribers', models.ManyToManyField(related_name='_conversationabouttalk_subscribers_+', to=settings.AUTH_USER_MODEL)), + ('subscribers', models.ManyToManyField(blank=True, related_name='_conversationabouttalk_subscribers_+', to=settings.AUTH_USER_MODEL)), ], options={ 'abstract': False, @@ -34,7 +34,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('participation', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='conversation', to='accounts.Participation')), - ('subscribers', models.ManyToManyField(related_name='_conversationwithparticipant_subscribers_+', to=settings.AUTH_USER_MODEL)), + ('subscribers', models.ManyToManyField(blank=True, related_name='_conversationwithparticipant_subscribers_+', to=settings.AUTH_USER_MODEL)), ], options={ 'abstract': False, @@ -47,7 +47,6 @@ class Migration(migrations.Migration): ('object_id', models.PositiveIntegerField()), ('token', models.CharField(default=conversations.utils.generate_message_token, max_length=64)), ('date', models.DateTimeField(auto_now_add=True)), - ('subject', models.CharField(blank=True, max_length=64)), ('content', models.TextField()), ('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')), diff --git a/conversations/migrations/0002_conversationabouttalk_talk.py b/conversations/migrations/0002_conversationabouttalk_talk.py index 9c268bf..c5281fe 100644 --- a/conversations/migrations/0002_conversationabouttalk_talk.py +++ b/conversations/migrations/0002_conversationabouttalk_talk.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-06-14 19:13 +# Generated by Django 1.9.7 on 2016-06-15 09:49 from __future__ import unicode_literals from django.db import migrations, models diff --git a/conversations/migrations/0003_auto_20160614_2046.py b/conversations/migrations/0003_auto_20160614_2046.py deleted file mode 100644 index 6a797b2..0000000 --- a/conversations/migrations/0003_auto_20160614_2046.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-06-14 20:46 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('conversations', '0002_conversationabouttalk_talk'), - ] - - operations = [ - migrations.RemoveField( - model_name='message', - name='subject', - ), - migrations.AlterField( - model_name='conversationabouttalk', - name='subscribers', - field=models.ManyToManyField(blank=True, related_name='_conversationabouttalk_subscribers_+', to=settings.AUTH_USER_MODEL), - ), - migrations.AlterField( - model_name='conversationwithparticipant', - name='subscribers', - field=models.ManyToManyField(blank=True, related_name='_conversationwithparticipant_subscribers_+', to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/proposals/migrations/0001_initial.py b/proposals/migrations/0001_initial.py index 44c3289..06b3948 100644 --- a/proposals/migrations/0001_initial.py +++ b/proposals/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-06-14 19:13 +# Generated by Django 1.9.7 on 2016-06-15 09:49 from __future__ import unicode_literals import autoslug.fields @@ -15,8 +15,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('sites', '0002_alter_domain_unique'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [