Merge pull request #10 from dabapps/1.0.0

release 1.0

Author: Pete Wildsmith

.travis.yml

@@ -3,8 +3,12 @@ sudo: false
 python:
 - '2.7'
 - '3.4'
+env:
+- DJANGO_VERSION=1.7
+- DJANGO_VERSION=1.8
 install:
 - pip install -r test-requirements.txt
+- pip install -U django==$DJANGO_VERSION
 script: python manage.py test
 deploy:
   provider: pypi

django_dbq/__init__.py

@@ -1 +1 @@
-__version__ = '0.0.2'
+__version__ = '1.0.0'

django_dbq/fields.py

@@ -0,0 +1,7 @@
+from uuidfield import UUIDField
+from django.db.models import SubfieldBase
+from django.utils import six
+
+
+class UUIDField(six.with_metaclass(SubfieldBase, UUIDField)):
+    pass

django_dbq/migrations/0001_initial.py

@@ -5,6 +5,11 @@
 import jsonfield.fields
 import uuid
 
+try:
+    from django.db.models import UUIDField
+except ImportError:
+    from django_dbq.fields import UUIDField
+
 
 class Migration(migrations.Migration):
 
@@ -15,7 +20,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Job',
             fields=[
-                ('id', models.UUIDField(serialize=False, editable=False, default=uuid.uuid4, primary_key=True)),
+                ('id', 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)),

django_dbq/migrations/0002_auto_20151016_1027.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('django_dbq', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='job',
+            options={'ordering': ['created']},
+        ),
+    ]

django_dbq/models.py

@@ -7,6 +7,11 @@
 import logging
 import uuid
 
+try:
+    from django.db.models import UUIDField
+except ImportError:
+    from django_dbq.fields import UUIDField
+
 
 logger = logging.getLogger(__name__)
 
@@ -56,7 +61,7 @@ class Job(models.Model):
 
     STATES = Choices("NEW", "READY", "PROCESSING", "FAILED", "COMPLETE")
 
-    id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
+    id = 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,4 +1,5 @@
-django-model-utils==1.5.0
+django-model-utils==2.3.1
+django-uuidfield==0.5.0
 jsonfield==1.0.3
 Django>=1.8
 simplesignals==0.3.0

setup.py

@@ -16,11 +16,11 @@
 author_email = '[email protected]'
 license = 'BSD'
 install_requires = [
-    'django-model-utils==1.5.0',
-    'django-uuidfield==0.4.0',
-    'jsonfield==0.9.20',
-    'Django>=1.6',
-    'simplesignals==0.3.0'
+    "django-model-utils==2.3.1",
+    "django-uuidfield==0.5.0",
+    "jsonfield==1.0.3",
+    "Django>=1.7",
+    "simplesignals==0.3.0",
 ]
 
 long_description = """Simple database-backed job queue system"""