From 225333319697e2c3d6c2c2cf65bd068c6c4b14a1 Mon Sep 17 00:00:00 2001 From: Win Date: Thu, 6 Jul 2017 11:18:47 +0000 Subject: [PATCH] Version 0.8 and initial migration update --- mqueue/__init__.py | 2 +- mqueue/migrations/0001_initial.py | 7 ++++-- mqueue/migrations/0002_auto_20170702_1105.py | 26 -------------------- 3 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 mqueue/migrations/0002_auto_20170702_1105.py diff --git a/mqueue/__init__.py b/mqueue/__init__.py index e24182d..7619a71 100644 --- a/mqueue/__init__.py +++ b/mqueue/__init__.py @@ -1,2 +1,2 @@ -__version__ = '0.7' +__version__ = '0.8' default_app_config = 'mqueue.apps.MqueueConfig' diff --git a/mqueue/migrations/0001_initial.py b/mqueue/migrations/0001_initial.py index fdafe8c..2a83d11 100644 --- a/mqueue/migrations/0001_initial.py +++ b/mqueue/migrations/0001_initial.py @@ -1,10 +1,11 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.10 on 2016-10-14 12:58 +# Generated by Django 1.11.1 on 2017-07-05 10:08 from __future__ import unicode_literals from django.conf import settings from django.db import migrations, models import django.db.models.deletion +import jsonfield.fields class Migration(migrations.Migration): @@ -29,13 +30,15 @@ class Migration(migrations.Migration): ('date_posted', models.DateTimeField(auto_now_add=True, verbose_name='Date posted')), ('event_class', models.CharField(blank=True, max_length=120, verbose_name='Class')), ('request', models.TextField(blank=True, verbose_name='Request')), + ('bucket', models.CharField(blank=True, max_length=60, verbose_name='Bucket')), + ('data', jsonfield.fields.JSONField(blank=True, verbose_name='Data')), ('content_type', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType', verbose_name='Content type')), ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='User')), ], options={ + 'verbose_name_plural': 'Events', 'ordering': ['-date_posted'], 'verbose_name': 'Event', - 'verbose_name_plural': 'Events', 'permissions': (('view_mevent', 'Can see Events'),), }, ), diff --git a/mqueue/migrations/0002_auto_20170702_1105.py b/mqueue/migrations/0002_auto_20170702_1105.py deleted file mode 100644 index 3833e75..0000000 --- a/mqueue/migrations/0002_auto_20170702_1105.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.2 on 2017-07-02 11:05 -from __future__ import unicode_literals - -from django.db import migrations, models -import jsonfield.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('mqueue', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='mevent', - name='bucket', - field=models.CharField(blank=True, max_length=60, verbose_name='Bucket'), - ), - migrations.AddField( - model_name='mevent', - name='data', - field=jsonfield.fields.JSONField(blank=True, verbose_name='Data'), - ), - ]