From 8110f63d7c004d73562814620d84f01d1b08a5d0 Mon Sep 17 00:00:00 2001 From: Sanket Dasgupta Date: Sat, 25 Jul 2020 02:16:26 +0530 Subject: [PATCH] fix: CI --- .../blog/migrations/0001_initial.py | 2 +- ...721_1828.py => 0002_auto_20200724_2045.py} | 4 +-- .../common/migrations/0001_initial.py | 2 +- ...721_1828.py => 0002_auto_20200724_2045.py} | 4 +-- .../community/migrations/0001_initial.py | 2 +- ...721_1828.py => 0002_auto_20200724_2045.py} | 4 +-- .../meetup/migrations/0001_initial.py | 2 +- ...721_1828.py => 0002_auto_20200724_2045.py} | 6 ++-- .../membership/migrations/0001_initial.py | 2 +- ...721_1828.py => 0002_auto_20200724_2045.py} | 6 ++-- .../users/migrations/0001_initial.py | 13 ++++++- .../users/migrations/0002_usersetting.py | 27 -------------- .../migrations/0003_auto_20200722_1126.py | 35 ------------------- 13 files changed, 29 insertions(+), 80 deletions(-) rename systers_portal/blog/migrations/{0002_auto_20200721_1828.py => 0002_auto_20200724_2045.py} (97%) rename systers_portal/common/migrations/{0002_auto_20200721_1828.py => 0002_auto_20200724_2045.py} (94%) rename systers_portal/community/migrations/{0002_auto_20200721_1828.py => 0002_auto_20200724_2045.py} (98%) rename systers_portal/meetup/migrations/{0002_auto_20200721_1828.py => 0002_auto_20200724_2045.py} (98%) rename systers_portal/membership/migrations/{0002_auto_20200721_1828.py => 0002_auto_20200724_2045.py} (95%) delete mode 100644 systers_portal/users/migrations/0002_usersetting.py delete mode 100644 systers_portal/users/migrations/0003_auto_20200722_1126.py diff --git a/systers_portal/blog/migrations/0001_initial.py b/systers_portal/blog/migrations/0001_initial.py index 3d7753c1..f437062e 100644 --- a/systers_portal/blog/migrations/0001_initial.py +++ b/systers_portal/blog/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.0.8 on 2020-07-21 18:28 +# Generated by Django 3.0.8 on 2020-07-24 20:45 import ckeditor.fields from django.db import migrations, models diff --git a/systers_portal/blog/migrations/0002_auto_20200721_1828.py b/systers_portal/blog/migrations/0002_auto_20200724_2045.py similarity index 97% rename from systers_portal/blog/migrations/0002_auto_20200721_1828.py rename to systers_portal/blog/migrations/0002_auto_20200724_2045.py index 1597ba80..3e24069e 100644 --- a/systers_portal/blog/migrations/0002_auto_20200721_1828.py +++ b/systers_portal/blog/migrations/0002_auto_20200724_2045.py @@ -1,4 +1,4 @@ -# Generated by Django 3.0.8 on 2020-07-21 18:28 +# Generated by Django 3.0.8 on 2020-07-24 20:45 from django.db import migrations, models import django.db.models.deletion @@ -10,8 +10,8 @@ class Migration(migrations.Migration): dependencies = [ ('blog', '0001_initial'), - ('community', '0001_initial'), ('users', '0001_initial'), + ('community', '0001_initial'), ] operations = [ diff --git a/systers_portal/common/migrations/0001_initial.py b/systers_portal/common/migrations/0001_initial.py index eafa0a6d..628aab0d 100644 --- a/systers_portal/common/migrations/0001_initial.py +++ b/systers_portal/common/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.0.8 on 2020-07-21 18:28 +# Generated by Django 3.0.8 on 2020-07-24 20:45 from django.db import migrations, models diff --git a/systers_portal/common/migrations/0002_auto_20200721_1828.py b/systers_portal/common/migrations/0002_auto_20200724_2045.py similarity index 94% rename from systers_portal/common/migrations/0002_auto_20200721_1828.py rename to systers_portal/common/migrations/0002_auto_20200724_2045.py index d3570a56..cc91f43e 100644 --- a/systers_portal/common/migrations/0002_auto_20200721_1828.py +++ b/systers_portal/common/migrations/0002_auto_20200724_2045.py @@ -1,4 +1,4 @@ -# Generated by Django 3.0.8 on 2020-07-21 18:28 +# Generated by Django 3.0.8 on 2020-07-24 20:45 from django.db import migrations, models import django.db.models.deletion @@ -9,9 +9,9 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('common', '0001_initial'), ('contenttypes', '0002_remove_content_type_name'), ('users', '0001_initial'), + ('common', '0001_initial'), ] operations = [ diff --git a/systers_portal/community/migrations/0001_initial.py b/systers_portal/community/migrations/0001_initial.py index e6caee7a..b2bca377 100644 --- a/systers_portal/community/migrations/0001_initial.py +++ b/systers_portal/community/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.0.8 on 2020-07-21 18:28 +# Generated by Django 3.0.8 on 2020-07-24 20:45 import ckeditor.fields from django.db import migrations, models diff --git a/systers_portal/community/migrations/0002_auto_20200721_1828.py b/systers_portal/community/migrations/0002_auto_20200724_2045.py similarity index 98% rename from systers_portal/community/migrations/0002_auto_20200721_1828.py rename to systers_portal/community/migrations/0002_auto_20200724_2045.py index 7fb4f664..eaebe8c7 100644 --- a/systers_portal/community/migrations/0002_auto_20200721_1828.py +++ b/systers_portal/community/migrations/0002_auto_20200724_2045.py @@ -1,4 +1,4 @@ -# Generated by Django 3.0.8 on 2020-07-21 18:28 +# Generated by Django 3.0.8 on 2020-07-24 20:45 from django.db import migrations, models import django.db.models.deletion @@ -9,9 +9,9 @@ class Migration(migrations.Migration): initial = True dependencies = [ + ('users', '0001_initial'), ('community', '0001_initial'), ('cities_light', '0009_add_subregion'), - ('users', '0001_initial'), ] operations = [ diff --git a/systers_portal/meetup/migrations/0001_initial.py b/systers_portal/meetup/migrations/0001_initial.py index fa53123f..95b90f40 100644 --- a/systers_portal/meetup/migrations/0001_initial.py +++ b/systers_portal/meetup/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.0.8 on 2020-07-21 18:28 +# Generated by Django 3.0.8 on 2020-07-24 20:45 import ckeditor.fields from django.db import migrations, models diff --git a/systers_portal/meetup/migrations/0002_auto_20200721_1828.py b/systers_portal/meetup/migrations/0002_auto_20200724_2045.py similarity index 98% rename from systers_portal/meetup/migrations/0002_auto_20200721_1828.py rename to systers_portal/meetup/migrations/0002_auto_20200724_2045.py index 9927d11d..bfe17789 100644 --- a/systers_portal/meetup/migrations/0002_auto_20200721_1828.py +++ b/systers_portal/meetup/migrations/0002_auto_20200724_2045.py @@ -1,4 +1,4 @@ -# Generated by Django 3.0.8 on 2020-07-21 18:28 +# Generated by Django 3.0.8 on 2020-07-24 20:45 from django.db import migrations, models import django.db.models.deletion @@ -9,9 +9,9 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('meetup', '0001_initial'), - ('cities_light', '0009_add_subregion'), ('users', '0001_initial'), + ('cities_light', '0009_add_subregion'), + ('meetup', '0001_initial'), ] operations = [ diff --git a/systers_portal/membership/migrations/0001_initial.py b/systers_portal/membership/migrations/0001_initial.py index 951bd7d7..a1fcc780 100644 --- a/systers_portal/membership/migrations/0001_initial.py +++ b/systers_portal/membership/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.0.8 on 2020-07-21 18:28 +# Generated by Django 3.0.8 on 2020-07-24 20:45 from django.db import migrations, models diff --git a/systers_portal/membership/migrations/0002_auto_20200721_1828.py b/systers_portal/membership/migrations/0002_auto_20200724_2045.py similarity index 95% rename from systers_portal/membership/migrations/0002_auto_20200721_1828.py rename to systers_portal/membership/migrations/0002_auto_20200724_2045.py index a3dab351..814b9c86 100644 --- a/systers_portal/membership/migrations/0002_auto_20200721_1828.py +++ b/systers_portal/membership/migrations/0002_auto_20200724_2045.py @@ -1,4 +1,4 @@ -# Generated by Django 3.0.8 on 2020-07-21 18:28 +# Generated by Django 3.0.8 on 2020-07-24 20:45 from django.db import migrations, models import django.db.models.deletion @@ -9,9 +9,9 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('membership', '0001_initial'), - ('community', '0001_initial'), ('users', '0001_initial'), + ('community', '0001_initial'), + ('membership', '0001_initial'), ] operations = [ diff --git a/systers_portal/users/migrations/0001_initial.py b/systers_portal/users/migrations/0001_initial.py index f4c07a48..d8377b4d 100644 --- a/systers_portal/users/migrations/0001_initial.py +++ b/systers_portal/users/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.0.8 on 2020-07-21 18:28 +# Generated by Django 3.0.8 on 2020-07-24 20:45 from django.conf import settings from django.db import migrations, models @@ -26,4 +26,15 @@ class Migration(migrations.Migration): ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], ), + migrations.CreateModel( + name='UserSetting', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('weekly_digest', models.BooleanField(default=True, verbose_name='Receive Weekly Digests from Communities')), + ('location_change', models.BooleanField(default=False, verbose_name='Get Notified on Change in Location for Meetups')), + ('time_change', models.BooleanField(default=False, verbose_name='Get Notified on Change in Timings for Meetups')), + ('reminder', models.BooleanField(default=False, verbose_name="Get Reminders for rsvp'd Meetups")), + ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='users.SystersUser')), + ], + ), ] diff --git a/systers_portal/users/migrations/0002_usersetting.py b/systers_portal/users/migrations/0002_usersetting.py deleted file mode 100644 index a06d5d17..00000000 --- a/systers_portal/users/migrations/0002_usersetting.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.6 on 2020-07-16 08:02 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0001_squashed_0003_auto_20160207_1550'), - ] - - operations = [ - migrations.CreateModel( - name='UserSetting', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('weekly_digest', models.BooleanField(default=False)), - ('location_change', models.BooleanField(default=False)), - ('time_change', models.BooleanField(default=False)), - ('reminder', models.BooleanField(default=False)), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='users.SystersUser')), - ], - ), - ] diff --git a/systers_portal/users/migrations/0003_auto_20200722_1126.py b/systers_portal/users/migrations/0003_auto_20200722_1126.py deleted file mode 100644 index df0645ef..00000000 --- a/systers_portal/users/migrations/0003_auto_20200722_1126.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.6 on 2020-07-22 11:26 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0002_usersetting'), - ] - - operations = [ - migrations.AlterField( - model_name='usersetting', - name='location_change', - field=models.BooleanField(default=False, verbose_name='Get Notified on Change in Location for Meetups'), - ), - migrations.AlterField( - model_name='usersetting', - name='reminder', - field=models.BooleanField(default=False, verbose_name="Get Reminders for rsvp'd Meetups"), - ), - migrations.AlterField( - model_name='usersetting', - name='time_change', - field=models.BooleanField(default=False, verbose_name='Get Notified on Change in Timings for Meetups'), - ), - migrations.AlterField( - model_name='usersetting', - name='weekly_digest', - field=models.BooleanField(default=True, verbose_name='Receive Weekly Digests from Communities'), - ), - ]