Merge pull request #6 from dabapps/python-3

Python 3 support

Author: j4mie

.travis.yml

@@ -1,6 +1,7 @@
 language: python
 python:
 - '2.7'
+- '3.4'
 install:
 - pip install -r requirements.txt
 script: python manage.py test

README.md

@@ -9,6 +9,11 @@ Asynchronous tasks are run via a *job queue*. This system is designed to support
 
 This is not yet production-ready, and the API is liable to change. Use at your own risk.
 
+**NOTE**: Between version 0.0.1 and 0.0.2, the project was upgraded to support
+Python 3. This required switching to Django's built-in UUIDField, which was added in Django 1.8. The simplest way to upgrade it to drop the existing
+`django_dbq_job` table, delete the migration from `django_migrations`, and then
+re-run `manage.py migrate`.
+
 ## Getting Started
 
 ### Describe your job

django_dbq/migrations/0001_initial.py

@@ -3,7 +3,7 @@
 
 from django.db import models, migrations
 import jsonfield.fields
-import uuidfield.fields
+import uuid
 
 
 class Migration(migrations.Migration):
@@ -15,18 +15,17 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Job',
             fields=[
-                ('id', uuidfield.fields.UUIDField(primary_key=True, serialize=False, editable=False, max_length=32, blank=True, unique=True, db_index=True)),
-                ('created', models.DateTimeField(auto_now_add=True, db_index=True)),
+                ('id', models.UUIDField(serialize=False, editable=False, default=uuid.uuid4, primary_key=True)),
+                ('created', models.DateTimeField(db_index=True, auto_now_add=True)),
                 ('modified', models.DateTimeField(auto_now=True)),
                 ('name', models.CharField(max_length=100)),
-                ('state', models.CharField(default=b'NEW', max_length=20, db_index=True, choices=[(b'NEW', b'NEW'), (b'READY', b'READY'), (b'PROCESSING', b'PROCESSING'), (b'FAILED', b'FAILED'), (b'COMPLETE', b'COMPLETE')])),
+                ('state', models.CharField(db_index=True, max_length=20, default='NEW', choices=[('NEW', 'NEW'), ('READY', 'READY'), ('PROCESSING', 'PROCESSING'), ('FAILED', 'FAILED'), ('COMPLETE', 'COMPLETE')])),
                 ('next_task', models.CharField(max_length=100, blank=True)),
                 ('workspace', jsonfield.fields.JSONField(null=True)),
-                ('queue_name', models.CharField(default=b'default', max_length=20, db_index=True)),
+                ('queue_name', models.CharField(db_index=True, max_length=20, default='default')),
             ],
             options={
                 'ordering': ['-created'],
             },
-            bases=(models.Model,),
         ),
     ]

django_dbq/models.py

@@ -4,7 +4,7 @@
 from jsonfield import JSONField
 from model_utils import Choices
 import logging
-import uuidfield
+import uuid
 
 
 logger = logging.getLogger(__name__)
@@ -43,7 +43,7 @@ class Job(models.Model):
 
     STATES = Choices("NEW", "READY", "PROCESSING", "FAILED", "COMPLETE")
 
-    id = uuidfield.UUIDField(primary_key=True, auto=True, db_index=True)
+    id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
     created = models.DateTimeField(auto_now_add=True, db_index=True)
     modified = models.DateTimeField(auto_now=True)
     name = models.CharField(max_length=100)
@@ -58,7 +58,9 @@ class Meta:
     objects = JobManager()
 
     def save(self, *args, **kwargs):
-        if not self.pk:
+        is_new = not Job.objects.filter(pk=self.pk).exists()
+
+        if is_new:
             self.next_task = get_next_task_name(self.name)
             self.workspace = self.workspace or {}
 

django_dbq/tests.py

@@ -5,7 +5,10 @@
 from django.test.utils import override_settings
 from django_dbq.management.commands.worker import process_job
 from django_dbq.models import Job
-from StringIO import StringIO
+try:
+    from StringIO import StringIO
+except ImportError:
+    from io import StringIO
 
 
 def test_task(job=None):

requirements.txt

@@ -1,5 +1,4 @@
 django-model-utils==1.5.0
-django-uuidfield==0.4.0
-jsonfield==0.9.20
-Django>=1.7
+jsonfield==1.0.3
+Django>=1.8
 simplesignals==0.3.0