Switch to Django's built-in UUIDField

Author: j4mie

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)

requirements.txt

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