diff --git a/.gitignore b/.gitignore index 4b24024..74d0380 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,7 @@ uwsgi.ini uwsgi.log infoscreen/static/js/hsl.json members/logs/* +members/migrations/* +infoscreen/migrations/* +webapp/migrations/* +.idea/ diff --git a/infoscreen/migrations/0001_initial.py b/infoscreen/migrations/0001_initial.py deleted file mode 100644 index 5254f3b..0000000 --- a/infoscreen/migrations/0001_initial.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9 on 2016-08-31 17:54 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='ABBJob', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('sw_id', models.IntegerField(default=-1)), - ('title', models.CharField(max_length=255)), - ('QR', models.CharField(default='', max_length=255)), - ('created', models.DateTimeField(default=datetime.datetime.now)), - ], - ), - ] diff --git a/infoscreen/migrations/0002_auto_20160831_1757.py b/infoscreen/migrations/0002_auto_20160831_1757.py deleted file mode 100644 index b21b61d..0000000 --- a/infoscreen/migrations/0002_auto_20160831_1757.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9 on 2016-08-31 17:57 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('infoscreen', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='abbjob', - name='created', - field=models.DateTimeField(default=django.utils.timezone.now), - ), - ] diff --git a/infoscreen/migrations/0003_auto_20160914_1543.py b/infoscreen/migrations/0003_auto_20160914_1543.py deleted file mode 100644 index 9c1c8ba..0000000 --- a/infoscreen/migrations/0003_auto_20160914_1543.py +++ /dev/null @@ -1,58 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9 on 2016-09-14 15:43 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('infoscreen', '0002_auto_20160831_1757'), - ] - - operations = [ - migrations.CreateModel( - name='InfoInstance', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('duration', models.FloatField(default=15.0)), - ], - ), - migrations.CreateModel( - name='InfoItem', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=255)), - ('template_url', models.CharField(max_length=512)), - ('expire_date', models.DateTimeField()), - ], - ), - migrations.CreateModel( - name='InfoOption', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('key', models.CharField(max_length=255)), - ('value', models.CharField(max_length=255)), - ('item', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='options', to='infoscreen.InfoItem')), - ], - ), - migrations.CreateModel( - name='Rotation', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=255)), - ], - ), - migrations.AddField( - model_name='infoinstance', - name='item', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='infoscreen.InfoItem'), - ), - migrations.AddField( - model_name='infoinstance', - name='rotation', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='instances', to='infoscreen.Rotation'), - ), - ] diff --git a/infoscreen/migrations/0004_auto_20160914_1747.py b/infoscreen/migrations/0004_auto_20160914_1747.py deleted file mode 100644 index 3e06eb3..0000000 --- a/infoscreen/migrations/0004_auto_20160914_1747.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9 on 2016-09-14 17:47 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('infoscreen', '0003_auto_20160914_1543'), - ] - - operations = [ - migrations.AlterField( - model_name='infoitem', - name='expire_date', - field=models.DateTimeField(blank=True, null=True), - ), - ] diff --git a/infoscreen/migrations/0005_auto_20160921_1252.py b/infoscreen/migrations/0005_auto_20160921_1252.py deleted file mode 100644 index 00efb65..0000000 --- a/infoscreen/migrations/0005_auto_20160921_1252.py +++ /dev/null @@ -1,36 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9 on 2016-09-21 12:52 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('infoscreen', '0004_auto_20160914_1747'), - ] - - operations = [ - migrations.RemoveField( - model_name='infoinstance', - name='item', - ), - migrations.RemoveField( - model_name='infoinstance', - name='rotation', - ), - migrations.RemoveField( - model_name='infooption', - name='item', - ), - migrations.DeleteModel( - name='InfoInstance', - ), - migrations.DeleteModel( - name='InfoItem', - ), - migrations.DeleteModel( - name='InfoOption', - ), - ] diff --git a/infoscreen/migrations/0006_abbinfoitem_externalimageinfoitem_imageinfoitem_infoinstance_infoitem.py b/infoscreen/migrations/0006_abbinfoitem_externalimageinfoitem_imageinfoitem_infoinstance_infoitem.py deleted file mode 100644 index 13c7368..0000000 --- a/infoscreen/migrations/0006_abbinfoitem_externalimageinfoitem_imageinfoitem_infoinstance_infoitem.py +++ /dev/null @@ -1,58 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9 on 2016-09-21 12:54 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('contenttypes', '0002_remove_content_type_name'), - ('infoscreen', '0005_auto_20160921_1252'), - ] - - operations = [ - migrations.CreateModel( - name='InfoInstance', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('duration', models.FloatField(default=15.0)), - ('item_id', models.PositiveIntegerField()), - ('item_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')), - ('rotation', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='instances', to='infoscreen.Rotation')), - ], - ), - migrations.CreateModel( - name='InfoItem', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=255)), - ('expire_date', models.DateTimeField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='ABBInfoItem', - fields=[ - ('infoitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='infoscreen.InfoItem')), - ], - bases=('infoscreen.infoitem',), - ), - migrations.CreateModel( - name='ExternalImageInfoItem', - fields=[ - ('infoitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='infoscreen.InfoItem')), - ('url', models.TextField()), - ], - bases=('infoscreen.infoitem',), - ), - migrations.CreateModel( - name='ImageInfoItem', - fields=[ - ('infoitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='infoscreen.InfoItem')), - ('img', models.ImageField(upload_to='infoimages/')), - ], - bases=('infoscreen.infoitem',), - ), - ] diff --git a/infoscreen/migrations/0007_sossoinfoitem.py b/infoscreen/migrations/0007_sossoinfoitem.py deleted file mode 100644 index d2ffd84..0000000 --- a/infoscreen/migrations/0007_sossoinfoitem.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9 on 2016-09-27 18:06 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('infoscreen', '0006_abbinfoitem_externalimageinfoitem_imageinfoitem_infoinstance_infoitem'), - ] - - operations = [ - migrations.CreateModel( - name='SossoInfoItem', - fields=[ - ('infoitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='infoscreen.InfoItem')), - ], - bases=('infoscreen.infoitem',), - ), - ] diff --git a/infoscreen/migrations/0008_delete_abbjob.py b/infoscreen/migrations/0008_delete_abbjob.py deleted file mode 100644 index 3a7400c..0000000 --- a/infoscreen/migrations/0008_delete_abbjob.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9 on 2016-12-10 17:23 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('infoscreen', '0007_sossoinfoitem'), - ] - - operations = [ - migrations.DeleteModel( - name='ABBJob', - ), - ] diff --git a/infoscreen/migrations/__init__.py b/infoscreen/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/members/migrations/0001_initial.py b/members/migrations/0001_initial.py deleted file mode 100644 index 39456c2..0000000 --- a/members/migrations/0001_initial.py +++ /dev/null @@ -1,28 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9 on 2016-05-30 16:29 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Member', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('first_name', models.CharField(max_length=127)), - ('last_name', models.CharField(max_length=127)), - ('email', models.EmailField(max_length=254)), - ('AYY', models.BooleanField()), - ('jas', models.BooleanField()), - ('POR', models.BooleanField()), - ], - ), - ] diff --git a/members/migrations/0002_auto_20160530_1642.py b/members/migrations/0002_auto_20160530_1642.py deleted file mode 100644 index 601e9f7..0000000 --- a/members/migrations/0002_auto_20160530_1642.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9 on 2016-05-30 16:42 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('members', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='member', - name='AYY', - field=models.BooleanField(default=False), - ), - migrations.AlterField( - model_name='member', - name='POR', - field=models.CharField(max_length=255), - ), - migrations.AlterField( - model_name='member', - name='jas', - field=models.BooleanField(default=False), - ), - ] diff --git a/members/migrations/0003_memberrequest.py b/members/migrations/0003_memberrequest.py deleted file mode 100644 index 4cc05d1..0000000 --- a/members/migrations/0003_memberrequest.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9 on 2016-07-25 15:57 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('members', '0002_auto_20160530_1642'), - ] - - operations = [ - migrations.CreateModel( - name='MemberRequest', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('submitted', models.DateTimeField(default=django.utils.timezone.now)), - ('member', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='members.Member')), - ], - ), - ] diff --git a/members/migrations/0004_auto_20160915_1606.py b/members/migrations/0004_auto_20160915_1606.py deleted file mode 100644 index b73c764..0000000 --- a/members/migrations/0004_auto_20160915_1606.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9 on 2016-09-15 16:06 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('members', '0003_memberrequest'), - ] - - operations = [ - migrations.RemoveField( - model_name='memberrequest', - name='submitted', - ), - migrations.AddField( - model_name='member', - name='created', - field=models.DateTimeField(default=django.utils.timezone.now), - ), - ] diff --git a/members/migrations/0005_member_paid.py b/members/migrations/0005_member_paid.py deleted file mode 100644 index bdbf762..0000000 --- a/members/migrations/0005_member_paid.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9 on 2016-10-04 12:40 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('members', '0004_auto_20160915_1606'), - ] - - operations = [ - migrations.AddField( - model_name='member', - name='paid', - field=models.DateTimeField(blank=True, default=None, null=True), - ), - ] diff --git a/members/migrations/0006_auto_20161210_1723.py b/members/migrations/0006_auto_20161210_1723.py deleted file mode 100644 index 1c92b38..0000000 --- a/members/migrations/0006_auto_20161210_1723.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9 on 2016-12-10 17:23 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('members', '0005_member_paid'), - ] - - operations = [ - migrations.AlterField( - model_name='member', - name='paid', - field=models.DateTimeField(default=datetime.datetime(1970, 1, 1, 0, 0)), - ), - ] diff --git a/members/migrations/__init__.py b/members/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/test_applet.sh b/test_applet.sh index a63cb67..ea52e3b 100755 --- a/test_applet.sh +++ b/test_applet.sh @@ -9,6 +9,7 @@ clear echo "This is a script that does the following things:" echo "* activate virtualenv" echo "* run Django migrations" +echo "* run unit tests" echo "* start Django devserver" echo "* deactivate virtualenv" @@ -16,5 +17,6 @@ activate python manage.py makemigrations --merge python manage.py makemigrations python manage.py migrate +python manage.py test python manage.py runserver deactivate diff --git a/webapp/migrations/0001_initial.py b/webapp/migrations/0001_initial.py deleted file mode 100644 index 47436e2..0000000 --- a/webapp/migrations/0001_initial.py +++ /dev/null @@ -1,56 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9 on 2016-05-18 22:59 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Info', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('publish_time', models.DateTimeField(default=django.utils.timezone.now)), - ], - ), - migrations.CreateModel( - name='InfoTr', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('lang', models.CharField(default='fi', max_length=2)), - ('topic', models.CharField(max_length=255)), - ('content', models.TextField()), - ('translation_for', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='translations', to='webapp.Info')), - ], - ), - migrations.CreateModel( - name='Tag', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('dummyname', models.CharField(max_length=127)), - ], - ), - migrations.CreateModel( - name='TagTr', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('lang', models.CharField(default='fi', max_length=2)), - ('name', models.CharField(max_length=127)), - ('translation_for', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='translations', to='webapp.Tag')), - ], - ), - migrations.AddField( - model_name='info', - name='tags', - field=models.ManyToManyField(related_name='news', to='webapp.Tag'), - ), - ] diff --git a/webapp/migrations/__init__.py b/webapp/migrations/__init__.py deleted file mode 100644 index e69de29..0000000