From 40721b681f6e95f4f25b68028037574a760d64bf Mon Sep 17 00:00:00 2001
From: Ilan Steemers <koed00@gmail.com>
Date: Tue, 7 Jul 2015 21:00:30 +0200
Subject: [PATCH 01/10] Added lastest migration

Made a squash

Next release will delete the old migrations
---
 .../0001_squashed_0003_auto_20150707_1854.py  | 82 +++++++++++++++++++
 .../migrations/0003_auto_20150707_1854.py     | 26 ++++++
 2 files changed, 108 insertions(+)
 create mode 100644 django_q/migrations/0001_squashed_0003_auto_20150707_1854.py
 create mode 100644 django_q/migrations/0003_auto_20150707_1854.py

diff --git a/django_q/migrations/0001_squashed_0003_auto_20150707_1854.py b/django_q/migrations/0001_squashed_0003_auto_20150707_1854.py
new file mode 100644
index 0000000..b1afb2d
--- /dev/null
+++ b/django_q/migrations/0001_squashed_0003_auto_20150707_1854.py
@@ -0,0 +1,82 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import django.utils.timezone
+import picklefield.fields
+
+
+class Migration(migrations.Migration):
+
+    replaces = [('django_q', '0001_initial'), ('django_q', '0002_auto_20150630_1624'), ('django_q', '0003_auto_20150707_1854')]
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Schedule',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', auto_created=True, serialize=False, primary_key=True)),
+                ('func', models.CharField(max_length=256, help_text='e.g. module.tasks.function')),
+                ('hook', models.CharField(max_length=256, help_text='e.g. module.tasks.result_function', null=True, blank=True)),
+                ('args', models.TextField(help_text="e.g. 1, 2, 'John'", null=True, blank=True)),
+                ('kwargs', models.TextField(help_text="e.g. x=1, y=2, name='John'", null=True, blank=True)),
+                ('schedule_type', models.CharField(max_length=1, choices=[('O', 'Once'), ('H', 'Hourly'), ('D', 'Daily'), ('W', 'Weekly'), ('M', 'Monthly'), ('Q', 'Quarterly'), ('Y', 'Yearly')], verbose_name='Schedule Type', default='O')),
+                ('repeats', models.SmallIntegerField(verbose_name='Repeats', help_text='n = n times, -1 = forever', default=-1)),
+                ('next_run', models.DateTimeField(null=True, verbose_name='Next Run', default=django.utils.timezone.now)),
+                ('task', models.CharField(max_length=100, editable=False, null=True)),
+            ],
+            options={
+                'verbose_name': 'Scheduled task',
+                'ordering': ['next_run'],
+            },
+        ),
+        migrations.CreateModel(
+            name='Task',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', auto_created=True, serialize=False, primary_key=True)),
+                ('name', models.CharField(max_length=100, editable=False)),
+                ('func', models.CharField(max_length=256)),
+                ('hook', models.CharField(max_length=256, null=True)),
+                ('args', picklefield.fields.PickledObjectField(editable=False, null=True)),
+                ('kwargs', picklefield.fields.PickledObjectField(editable=False, null=True)),
+                ('result', picklefield.fields.PickledObjectField(editable=False, null=True)),
+                ('started', models.DateTimeField(editable=False)),
+                ('stopped', models.DateTimeField(editable=False)),
+                ('success', models.BooleanField(editable=False, default=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Failure',
+            fields=[
+            ],
+            options={
+                'verbose_name': 'Failed task',
+                'proxy': True,
+            },
+            bases=('django_q.task',),
+        ),
+        migrations.CreateModel(
+            name='Success',
+            fields=[
+            ],
+            options={
+                'verbose_name': 'Successful task',
+                'proxy': True,
+            },
+            bases=('django_q.task',),
+        ),
+        migrations.AlterModelOptions(
+            name='failure',
+            options={'verbose_name': 'Failed task', 'verbose_name_plural': 'Failed tasks'},
+        ),
+        migrations.AlterModelOptions(
+            name='schedule',
+            options={'verbose_name': 'Scheduled task', 'ordering': ['next_run'], 'verbose_name_plural': 'Scheduled tasks'},
+        ),
+        migrations.AlterModelOptions(
+            name='success',
+            options={'verbose_name': 'Successful task', 'verbose_name_plural': 'Successful tasks'},
+        ),
+    ]
diff --git a/django_q/migrations/0003_auto_20150707_1854.py b/django_q/migrations/0003_auto_20150707_1854.py
new file mode 100644
index 0000000..9ed7257
--- /dev/null
+++ b/django_q/migrations/0003_auto_20150707_1854.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('django_q', '0002_auto_20150630_1624'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='failure',
+            options={'verbose_name_plural': 'Failed tasks', 'verbose_name': 'Failed task'},
+        ),
+        migrations.AlterModelOptions(
+            name='schedule',
+            options={'ordering': ['next_run'], 'verbose_name_plural': 'Scheduled tasks', 'verbose_name': 'Scheduled task'},
+        ),
+        migrations.AlterModelOptions(
+            name='success',
+            options={'verbose_name_plural': 'Successful tasks', 'verbose_name': 'Successful task'},
+        ),
+    ]

From ddf861a16db22725a0685b13be3ffc76fa1c4dd2 Mon Sep 17 00:00:00 2001
From: Ilan Steemers <koed00@gmail.com>
Date: Tue, 7 Jul 2015 21:50:58 +0200
Subject: [PATCH 02/10] Changed url to rtd

added keywords to setup
---
 setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index a65d299..57b05bd 100644
--- a/setup.py
+++ b/setup.py
@@ -29,9 +29,10 @@ setup(
     version='0.2.2',
     author='Ilan Steemers',
     author_email='koed00@gmail.com',
+    keywords='django task queue worker redis multiprocessing',
     packages=['django_q'],
     include_package_data=True,
-    url='https://github.com/koed00/django-q',
+    url='https://django-q.readthedocs.org',
     license='MIT',
     description='A multiprocessing task queue for Django',
     long_description=README,

From f8708cfd7391a52edaeb5ec783c5d921c95672ee Mon Sep 17 00:00:00 2001
From: Ilan Steemers <koed00@gmail.com>
Date: Wed, 8 Jul 2015 13:33:03 +0200
Subject: [PATCH 03/10] Task now uses a UUID4 instead of a LUID

---
 django_q/cluster.py                           |  7 ++--
 .../migrations/0002_auto_20150708_1006.py     | 24 ++++++++++++++
 django_q/models.py                            | 32 ++++++++++++-------
 django_q/monitor.py                           |  1 +
 django_q/tasks.py                             | 32 +++++++++----------
 django_q/tests/test_admin.py                  | 28 +++++++++-------
 docs/schedules.rst                            |  2 +-
 docs/tasks.rst                                | 14 +++++---
 8 files changed, 91 insertions(+), 49 deletions(-)
 create mode 100644 django_q/migrations/0002_auto_20150708_1006.py

diff --git a/django_q/cluster.py b/django_q/cluster.py
index e2e6f5b..6e1f233 100644
--- a/django_q/cluster.py
+++ b/django_q/cluster.py
@@ -394,7 +394,8 @@ def save_task(task):
         Success.objects.first().delete()
 
     try:
-        Task.objects.create(name=task['name'],
+        Task.objects.create(id=task['id'],
+                            name=task['name'],
                             func=task['func'],
                             hook=task['hook'],
                             args=task['args'],
@@ -451,7 +452,7 @@ def scheduler(list_key=Conf.Q_LIST):
         kwargs['list_key'] = list_key
         s.task = async(s.func, *args, **kwargs)
         if not s.task:
-            logger.error(_('{} failed to create task from  schedule {}').format(current_process().name, s.id))
+            logger.error(_('{} failed to create a task from schedule {} [{}]').format(current_process().name, s.id), s.func)
         else:
-            logger.info(_('{} created [{}] from schedule {}').format(current_process().name, s.task, s.id))
+            logger.info(_('{} created a task from schedule {} [{}]').format(current_process().name, s.id, s.func))
         s.save()
diff --git a/django_q/migrations/0002_auto_20150708_1006.py b/django_q/migrations/0002_auto_20150708_1006.py
new file mode 100644
index 0000000..48524c3
--- /dev/null
+++ b/django_q/migrations/0002_auto_20150708_1006.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('django_q', '0001_squashed_0003_auto_20150707_1854'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='schedule',
+            name='task',
+            field=models.CharField(null=True, max_length=32, editable=False),
+        ),
+        migrations.AlterField(
+            model_name='task',
+            name='id',
+            field=models.CharField(serialize=False, max_length=32, primary_key=True, editable=False),
+        ),
+    ]
diff --git a/django_q/models.py b/django_q/models.py
index 1e00d68..c802eb5 100644
--- a/django_q/models.py
+++ b/django_q/models.py
@@ -11,6 +11,7 @@ from picklefield import PickledObjectField
 
 
 class Task(models.Model):
+    id = models.CharField(max_length=32, primary_key=True, editable=False)
     name = models.CharField(max_length=100, editable=False)
     func = models.CharField(max_length=256)
     hook = models.CharField(max_length=256, null=True)
@@ -22,9 +23,18 @@ class Task(models.Model):
     success = models.BooleanField(default=True, editable=False)
 
     @staticmethod
-    def get_result(name):
-        if Task.objects.filter(name=name).exists():
-            return Task.objects.get(name=name).result
+    def get_result(task_id):
+        if len(task_id) == 32 and Task.objects.filter(id=task_id).exists():
+            return Task.objects.get(id=task_id).result
+        elif Task.objects.filter(name=task_id).exists():
+            return Task.objects.get(name=task_id).result
+
+    @staticmethod
+    def get_task(task_id):
+        if len(task_id) == 32 and Task.objects.filter(id=task_id).exists():
+            return Task.objects.get(id=task_id)
+        elif Task.objects.filter(name=task_id).exists():
+            return Task.objects.get(name=task_id)
 
     def time_taken(self):
         return (self.stopped - self.started).total_seconds()
@@ -111,28 +121,26 @@ class Schedule(models.Model):
     schedule_type = models.CharField(max_length=1, choices=TYPE, default=TYPE[0][0], verbose_name=_('Schedule Type'))
     repeats = models.SmallIntegerField(default=-1, verbose_name=_('Repeats'), help_text=_('n = n times, -1 = forever'))
     next_run = models.DateTimeField(verbose_name=_('Next Run'), default=timezone.now, null=True)
-    task = models.CharField(max_length=100, editable=False, null=True)
+    task = models.CharField(max_length=32, null=True, editable=False)
+
+    def success(self):
+        if self.task and Task.objects.filter(id=self.task):
+            return Task.objects.get(id=self.task).success
 
     def last_run(self):
-        if Task.objects.filter(name=self.task).exists():
-            task = Task.objects.get(name=self.task)
+        if self.task and Task.objects.filter(id=self.task):
+            task = Task.objects.get(id=self.task)
             if task.success:
                 url = reverse('admin:django_q_success_change', args=(task.id,))
             else:
                 url = reverse('admin:django_q_failure_change', args=(task.id,))
             return '<a href="{}">[{}]</a>'.format(url, self.task)
-
         return None
 
-    def success(self):
-        if Task.objects.filter(name=self.task).exists():
-            return Task.objects.get(name=self.task).success
-
     def __unicode__(self):
         return self.func
 
     success.boolean = True
-    last_run.allow_tags = True
 
     class Meta:
         app_label = 'django_q'
diff --git a/django_q/monitor.py b/django_q/monitor.py
index e946f61..2ae93d4 100644
--- a/django_q/monitor.py
+++ b/django_q/monitor.py
@@ -43,6 +43,7 @@ def monitor(run_once=False):
             stats = Stat.get_all(r=r)
             print(term.clear_eos())
             for stat in stats:
+                status = stat.status
                 # color status
                 if stat.status == Conf.WORKING:
                     status = term.green(str(Conf.WORKING))
diff --git a/django_q/tasks.py b/django_q/tasks.py
index 17f7235..3bf9478 100644
--- a/django_q/tasks.py
+++ b/django_q/tasks.py
@@ -13,8 +13,6 @@ from .models import Schedule, Task
 from .humanhash import uuid
 
 
-
-
 def async(func, *args, **kwargs):
     """
     Sends a task to the cluster
@@ -23,12 +21,13 @@ def async(func, *args, **kwargs):
     hook = kwargs.pop('hook', None)
     list_key = kwargs.pop('list_key', Conf.Q_LIST)
     r = kwargs.pop('redis', redis_client)
-
-    task = {'name': uuid()[0], 'func': func, 'hook': hook, 'args': args, 'kwargs': kwargs, 'started': timezone.now()}
+    tag = uuid()
+    task = {'id': tag[1], 'name': tag[0], 'func': func, 'hook': hook, 'args': args, 'kwargs': kwargs,
+            'started': timezone.now()}
     pack = SignedPackage.dumps(task)
     r.rpush(list_key, pack)
-    logger.debug('Pushed {}'.format(pack))
-    return task['name']
+    logger.debug('Pushed {}'.format(tag))
+    return task['id']
 
 
 def schedule(func, *args, **kwargs):
@@ -60,27 +59,26 @@ def schedule(func, *args, **kwargs):
                                    )
 
 
-def result(name):
+def result(task_id):
     """
     Returns the result of the named task
-    :type name: str or unicode
-    :param name: the task name
+    :type task_id: str or uuid
+    :param task_id: the task name or uuid
     :return: the result object of this task
-    :rtype: object or str
+    :rtype: object
     """
-    return Task.get_result(name)
+    return Task.get_result(task_id)
 
 
-def fetch(name):
+def fetch(task_id):
     """
     Returns the processed task
-    :param name: the task name
-    :type name: str or unicode
+    :param task_id: the task name or uuid
+    :type task_id: str or uuid
     :return: the full task object
     :rtype: Task
     """
-    if Task.objects.filter(name=name).exists():
-        return Task.objects.get(name=name)
+    return Task.get_task(task_id)
 
 
 class SignedPackage(object):
@@ -116,4 +114,4 @@ class PickleSerializer(object):
 
     @staticmethod
     def loads(data):
-        return pickle.loads(data)
\ No newline at end of file
+        return pickle.loads(data)
diff --git a/django_q/tests/test_admin.py b/django_q/tests/test_admin.py
index 9e2b525..43c6ce8 100644
--- a/django_q/tests/test_admin.py
+++ b/django_q/tests/test_admin.py
@@ -1,26 +1,32 @@
 from django.core.urlresolvers import reverse
 
 from django.utils import timezone
-
 import pytest
 
 from django_q.tasks import schedule
 from django_q.models import Task, Failure
+from humanhash import uuid
 
 
 @pytest.mark.django_db
 def test_admin_views(admin_client):
     s = schedule('sched.test')
-    f = Task.objects.create(name='alfa-pappa-bravo-fail',
-                            func='test.fail',
-                            started=timezone.now(),
-                            stopped=timezone.now(),
-                            success=False)
-    t = Task.objects.create(name='alfa-pappa-bravo-success',
-                            func='test.succes',
-                            started=timezone.now(),
-                            stopped=timezone.now(),
-                            success=True)
+    tag = uuid()
+    f = Task.objects.create(
+        id=tag[1],
+        name=tag[0],
+        func='test.fail',
+        started=timezone.now(),
+        stopped=timezone.now(),
+        success=False)
+    tag = uuid()
+    t = Task.objects.create(
+        id=tag[1],
+        name=tag[0],
+        func='test.succes',
+        started=timezone.now(),
+        stopped=timezone.now(),
+        success=True)
     admin_urls = (
         # schedule
         reverse('admin:django_q_schedule_changelist'),
diff --git a/docs/schedules.rst b/docs/schedules.rst
index c17c99e..99a8595 100644
--- a/docs/schedules.rst
+++ b/docs/schedules.rst
@@ -77,7 +77,7 @@ Reference
 
     .. py:attribute:: task
 
-    Name of the last task generated by this schedule.
+    Id of the last task generated by this schedule.
 
     .. py:method:: last_run()
 
diff --git a/docs/tasks.rst b/docs/tasks.rst
index 4a49b5b..9a32555 100644
--- a/docs/tasks.rst
+++ b/docs/tasks.rst
@@ -61,21 +61,21 @@ Reference
    :type hook: str or object
    :param redis: Optional redis connection
    :param kwargs: Keyword arguments for the task function
-   :returns: The name of the task
+   :returns: The uuid of the task
    :rtype: str
 
-.. py:function:: result(name)
+.. py:function:: result(task_id)
 
     Gets the result of a previously executed task
 
-    :param str name: the name of the task
+    :param str task_id: the uuid or name of the task
     :returns: The result of the executed task
 
-.. py:function:: fetch(name)
+.. py:function:: fetch(task_id)
 
     Returns a previously executed task
 
-    :param str name: the name of the task
+    :param str name: the uuid or name of the task
     :returns: The task
     :rtype: Task
 
@@ -87,6 +87,10 @@ Reference
 
     Database model describing an executed task
 
+    .. py:attribute:: id
+
+    An  :func:`uuid.uuid4()` identifier
+
     .. py:attribute:: name
 
     The name of the task

From f29fdee5add29025aea91b7be3c2c63ddead690b Mon Sep 17 00:00:00 2001
From: Ilan Steemers <koed00@gmail.com>
Date: Wed, 8 Jul 2015 13:43:46 +0200
Subject: [PATCH 04/10] Fixes import error

---
 django_q/tests/test_admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/django_q/tests/test_admin.py b/django_q/tests/test_admin.py
index 43c6ce8..a18bcdf 100644
--- a/django_q/tests/test_admin.py
+++ b/django_q/tests/test_admin.py
@@ -5,7 +5,7 @@ import pytest
 
 from django_q.tasks import schedule
 from django_q.models import Task, Failure
-from humanhash import uuid
+from django_q.humanhash import uuid
 
 
 @pytest.mark.django_db

From d9d0e7db73b5e84a83750e497ccb895f1dbc0449 Mon Sep 17 00:00:00 2001
From: Ilan Steemers <koed00@gmail.com>
Date: Wed, 8 Jul 2015 14:27:51 +0200
Subject: [PATCH 05/10] consistent task name formatting

---
 django_q/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/django_q/models.py b/django_q/models.py
index c802eb5..02f7fcb 100644
--- a/django_q/models.py
+++ b/django_q/models.py
@@ -57,12 +57,12 @@ def call_hook(sender, instance, **kwargs):
                 m = importlib.import_module(module)
                 f = getattr(m, func)
             except (ValueError, ImportError, AttributeError):
-                logger.error(_('malformed return hook \'{}\' for {}').format(instance.hook, instance.name))
+                logger.error(_('malformed return hook \'{}\' for [{}]').format(instance.hook, instance.name))
                 return
         try:
             f(instance)
         except Exception as e:
-            logger.error(_('return hook {} failed on {} because {}').format(instance.hook, instance.name, e))
+            logger.error(_('return hook {} failed on [{}] because {}').format(instance.hook, instance.name, e))
 
 
 class SuccessManager(models.Manager):

From b2098d3f0a799b0ade9528779edcd5c5655e1da7 Mon Sep 17 00:00:00 2001
From: Ilan Steemers <koed00@gmail.com>
Date: Wed, 8 Jul 2015 15:09:19 +0200
Subject: [PATCH 06/10] Updated docs for new version

---
 docs/tasks.rst | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/docs/tasks.rst b/docs/tasks.rst
index 9a32555..e773919 100644
--- a/docs/tasks.rst
+++ b/docs/tasks.rst
@@ -93,7 +93,12 @@ Reference
 
     .. py:attribute:: name
 
-    The name of the task
+    The name of the task as a humanized version of the :attr:`id`
+
+        .. note::
+
+            This is for convenience and can be used as a parameter for most functions that take a `task_id`.
+            Keep in mind however that it is not guaranteed to be unique if you store very large amounts of tasks in the database.
 
     .. py:attribute:: func
 
@@ -119,7 +124,7 @@ Reference
 
     .. py:attribute:: started
 
-    The moment the task was picked up by a worker
+    The moment the task was created by an async command
 
     .. py:attribute:: stopped
 
@@ -131,11 +136,15 @@ Reference
 
     .. py:method:: time_taken
 
-    Calculates the difference in seconds between started and stopped
+    Calculates the difference in seconds between started and stopped.
 
-    .. py:classmethod:: get_result(task_name)
+        .. note::
 
-     Get a result directly by task name
+            Time taken represents the time a task spends in the cluster, this includes any time it may have waited in the queue.
+
+    .. py:classmethod:: get_result(task_id)
+
+     Get a result directly by task uuid or name
 
 .. py:class:: Success
 

From 44c8edb0a2104c1f3b8bed05bd87d93b52d53d61 Mon Sep 17 00:00:00 2001
From: Ilan Steemers <koed00@gmail.com>
Date: Wed, 8 Jul 2015 15:40:38 +0200
Subject: [PATCH 07/10] Keep task length on schedule for backward compatibility

Migrations on existing data would fail because of the old names being longer than the uuid. Keeping the field length at 100 will keep it compatible with existing  data.

Removed the squashed migrations cause this will cause dependency problems on existing installations. Every new migration will list the squashed migrations as a dependency. Not a problem for new installations, but will crash on exisitng ones.
---
 ...03_auto_20150707_1854.py => 0003_auto_20150708_1326.py} | 7 ++++++-
 django_q/models.py                                         | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)
 rename django_q/migrations/{0003_auto_20150707_1854.py => 0003_auto_20150708_1326.py} (67%)

diff --git a/django_q/migrations/0003_auto_20150707_1854.py b/django_q/migrations/0003_auto_20150708_1326.py
similarity index 67%
rename from django_q/migrations/0003_auto_20150707_1854.py
rename to django_q/migrations/0003_auto_20150708_1326.py
index 9ed7257..05ad1b0 100644
--- a/django_q/migrations/0003_auto_20150707_1854.py
+++ b/django_q/migrations/0003_auto_20150708_1326.py
@@ -17,10 +17,15 @@ class Migration(migrations.Migration):
         ),
         migrations.AlterModelOptions(
             name='schedule',
-            options={'ordering': ['next_run'], 'verbose_name_plural': 'Scheduled tasks', 'verbose_name': 'Scheduled task'},
+            options={'verbose_name_plural': 'Scheduled tasks', 'ordering': ['next_run'], 'verbose_name': 'Scheduled task'},
         ),
         migrations.AlterModelOptions(
             name='success',
             options={'verbose_name_plural': 'Successful tasks', 'verbose_name': 'Successful task'},
         ),
+        migrations.AlterField(
+            model_name='task',
+            name='id',
+            field=models.CharField(max_length=32, primary_key=True, editable=False, serialize=False),
+        ),
     ]
diff --git a/django_q/models.py b/django_q/models.py
index 02f7fcb..d16432a 100644
--- a/django_q/models.py
+++ b/django_q/models.py
@@ -121,7 +121,7 @@ class Schedule(models.Model):
     schedule_type = models.CharField(max_length=1, choices=TYPE, default=TYPE[0][0], verbose_name=_('Schedule Type'))
     repeats = models.SmallIntegerField(default=-1, verbose_name=_('Repeats'), help_text=_('n = n times, -1 = forever'))
     next_run = models.DateTimeField(verbose_name=_('Next Run'), default=timezone.now, null=True)
-    task = models.CharField(max_length=32, null=True, editable=False)
+    task = models.CharField(max_length=100, null=True, editable=False)
 
     def success(self):
         if self.task and Task.objects.filter(id=self.task):

From f30cf456418b27a19355f8389e694b10dc608223 Mon Sep 17 00:00:00 2001
From: Ilan Steemers <koed00@gmail.com>
Date: Wed, 8 Jul 2015 15:42:30 +0200
Subject: [PATCH 08/10] Removing old migrations

---
 .../0001_squashed_0003_auto_20150707_1854.py  | 82 -------------------
 .../migrations/0002_auto_20150708_1006.py     | 24 ------
 2 files changed, 106 deletions(-)
 delete mode 100644 django_q/migrations/0001_squashed_0003_auto_20150707_1854.py
 delete mode 100644 django_q/migrations/0002_auto_20150708_1006.py

diff --git a/django_q/migrations/0001_squashed_0003_auto_20150707_1854.py b/django_q/migrations/0001_squashed_0003_auto_20150707_1854.py
deleted file mode 100644
index b1afb2d..0000000
--- a/django_q/migrations/0001_squashed_0003_auto_20150707_1854.py
+++ /dev/null
@@ -1,82 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-import django.utils.timezone
-import picklefield.fields
-
-
-class Migration(migrations.Migration):
-
-    replaces = [('django_q', '0001_initial'), ('django_q', '0002_auto_20150630_1624'), ('django_q', '0003_auto_20150707_1854')]
-
-    dependencies = [
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Schedule',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', auto_created=True, serialize=False, primary_key=True)),
-                ('func', models.CharField(max_length=256, help_text='e.g. module.tasks.function')),
-                ('hook', models.CharField(max_length=256, help_text='e.g. module.tasks.result_function', null=True, blank=True)),
-                ('args', models.TextField(help_text="e.g. 1, 2, 'John'", null=True, blank=True)),
-                ('kwargs', models.TextField(help_text="e.g. x=1, y=2, name='John'", null=True, blank=True)),
-                ('schedule_type', models.CharField(max_length=1, choices=[('O', 'Once'), ('H', 'Hourly'), ('D', 'Daily'), ('W', 'Weekly'), ('M', 'Monthly'), ('Q', 'Quarterly'), ('Y', 'Yearly')], verbose_name='Schedule Type', default='O')),
-                ('repeats', models.SmallIntegerField(verbose_name='Repeats', help_text='n = n times, -1 = forever', default=-1)),
-                ('next_run', models.DateTimeField(null=True, verbose_name='Next Run', default=django.utils.timezone.now)),
-                ('task', models.CharField(max_length=100, editable=False, null=True)),
-            ],
-            options={
-                'verbose_name': 'Scheduled task',
-                'ordering': ['next_run'],
-            },
-        ),
-        migrations.CreateModel(
-            name='Task',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', auto_created=True, serialize=False, primary_key=True)),
-                ('name', models.CharField(max_length=100, editable=False)),
-                ('func', models.CharField(max_length=256)),
-                ('hook', models.CharField(max_length=256, null=True)),
-                ('args', picklefield.fields.PickledObjectField(editable=False, null=True)),
-                ('kwargs', picklefield.fields.PickledObjectField(editable=False, null=True)),
-                ('result', picklefield.fields.PickledObjectField(editable=False, null=True)),
-                ('started', models.DateTimeField(editable=False)),
-                ('stopped', models.DateTimeField(editable=False)),
-                ('success', models.BooleanField(editable=False, default=True)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Failure',
-            fields=[
-            ],
-            options={
-                'verbose_name': 'Failed task',
-                'proxy': True,
-            },
-            bases=('django_q.task',),
-        ),
-        migrations.CreateModel(
-            name='Success',
-            fields=[
-            ],
-            options={
-                'verbose_name': 'Successful task',
-                'proxy': True,
-            },
-            bases=('django_q.task',),
-        ),
-        migrations.AlterModelOptions(
-            name='failure',
-            options={'verbose_name': 'Failed task', 'verbose_name_plural': 'Failed tasks'},
-        ),
-        migrations.AlterModelOptions(
-            name='schedule',
-            options={'verbose_name': 'Scheduled task', 'ordering': ['next_run'], 'verbose_name_plural': 'Scheduled tasks'},
-        ),
-        migrations.AlterModelOptions(
-            name='success',
-            options={'verbose_name': 'Successful task', 'verbose_name_plural': 'Successful tasks'},
-        ),
-    ]
diff --git a/django_q/migrations/0002_auto_20150708_1006.py b/django_q/migrations/0002_auto_20150708_1006.py
deleted file mode 100644
index 48524c3..0000000
--- a/django_q/migrations/0002_auto_20150708_1006.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('django_q', '0001_squashed_0003_auto_20150707_1854'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='schedule',
-            name='task',
-            field=models.CharField(null=True, max_length=32, editable=False),
-        ),
-        migrations.AlterField(
-            model_name='task',
-            name='id',
-            field=models.CharField(serialize=False, max_length=32, primary_key=True, editable=False),
-        ),
-    ]

From 82f9c4b44fdd7c6bfd6554df7cf9bbff002322c3 Mon Sep 17 00:00:00 2001
From: Ilan Steemers <koed00@gmail.com>
Date: Wed, 8 Jul 2015 18:46:08 +0200
Subject: [PATCH 09/10] Getting ready for version 0.3.0

---
 django_q/__init__.py | 2 +-
 setup.py             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/django_q/__init__.py b/django_q/__init__.py
index e622c82..10c9635 100644
--- a/django_q/__init__.py
+++ b/django_q/__init__.py
@@ -1,6 +1,6 @@
 from .tasks import async, schedule, result, fetch
 from .models import Task, Schedule
 
-VERSION = (0, 2, 2)
+VERSION = (0, 3, 0)
 
 default_app_config = 'django_q.apps.DjangoQConfig'
diff --git a/setup.py b/setup.py
index 57b05bd..f24280b 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ class PyTest(Command):
 
 setup(
     name='django-q',
-    version='0.2.2',
+    version='0.3.0',
     author='Ilan Steemers',
     author_email='koed00@gmail.com',
     keywords='django task queue worker redis multiprocessing',

From f529fc16cb2c104d91a7cb332cb373b5a43ffdd0 Mon Sep 17 00:00:00 2001
From: Ilan Steemers <koed00@gmail.com>
Date: Wed, 8 Jul 2015 20:30:02 +0200
Subject: [PATCH 10/10] Upped docs to 0.3.0

---
 docs/conf.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 1a07031..c1583b5 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -68,9 +68,9 @@ author = 'Ilan Steemers'
 # built documents.
 #
 # The short X.Y version.
-version = '0.2.0'
+version = '0.3'
 # The full version, including alpha/beta/rc tags.
-release = '0.2.0'
+release = '0.3.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.