Merge pull request #30 from dabapps/django-and-python-support

Update Django and python support

Author: jordaneb

.travis.yml

@@ -2,15 +2,17 @@ language: python
 sudo: false
 services:
   - mysql
+  - postgresql
 python:
-- '3.4'
+- '3.5'
 - '3.6'
 - '3.7'
+- '3.8'
 env:
-- DJANGO_VERSION=1.8
-- DJANGO_VERSION=1.9
-- DJANGO_VERSION=1.10
-- DJANGO_VERSION=1.11
+- DJANGO_VERSION=1.11 DATABASE_URL=postgres://[email protected]/dbq
+- DJANGO_VERSION=2.2 DATABASE_URL=postgres://[email protected]/dbq
+- DJANGO_VERSION=1.11 DATABASE_URL=mysql://[email protected]/dbq
+- DJANGO_VERSION=2.2 DATABASE_URL=mysql://[email protected]/dbq
 install:
 - pip install -r test-requirements.txt
 - pip install -U django==$DJANGO_VERSION

README.md

@@ -7,7 +7,11 @@ Simple databased-backed job queue. Jobs are defined in your settings, and are pr
 
 Asynchronous tasks are run via a *job queue*. This system is designed to support multi-step job workflows.
 
-Tested against Django 1.8, 1.9, 1.10, 1.11
+Supported and tested against:
+- Django 1.11 and 2.2
+- Python 3.7 and 3.8
+
+This package may still work with older versions of Django and Python but they aren't explicitly supported.
 
 ## Getting Started
 

django_dbq/fields.py

@@ -5,10 +5,7 @@
 import jsonfield.fields
 import uuid
 
-try:
-    from django.db.models import UUIDField
-except ImportError:
-    from django_dbq.fields import UUIDField
+from django.db.models import UUIDField
 
 
 class Migration(migrations.Migration):

django_dbq/migrations/0001_initial.py

@@ -2,16 +2,11 @@
 from django.utils.module_loading import import_string
 from django_dbq.tasks import get_next_task_name, get_failure_hook_name, get_creation_hook_name
 from jsonfield import JSONField
-from model_utils import Choices
+from django.db.models import UUIDField
 import datetime
 import logging
 import uuid
 
-try:
-    from django.db.models import UUIDField
-except ImportError:
-    from django_dbq.fields import UUIDField
-
 
 logger = logging.getLogger(__name__)
 
@@ -61,13 +56,26 @@ def to_process(self, queue_name):
 
 class Job(models.Model):
 
-    STATES = Choices("NEW", "READY", "PROCESSING", "FAILED", "COMPLETE")
+    class STATES:
+        NEW = 'NEW'
+        READY = 'READY'
+        PROCESSING = 'PROCESSING'
+        FAILED = 'FAILED'
+        COMPLETE = 'COMPLETE'
+
+    STATE_CHOICES = [
+        (STATES.NEW, "NEW"),
+        (STATES.READY, "READY"),
+        (STATES.PROCESSING, "PROCESSING"),
+        (STATES.FAILED, "FAILED"),
+        (STATES.COMPLETE, "COMPLETE"),
+    ]
 
     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)
-    state = models.CharField(max_length=20, choices=STATES, default=STATES.NEW, db_index=True)
+    state = models.CharField(max_length=20, choices=STATE_CHOICES, default=STATES.NEW, db_index=True)
     next_task = models.CharField(max_length=100, blank=True)
     workspace = JSONField(null=True)
     queue_name = models.CharField(max_length=20, default='default', db_index=True)

django_dbq/models.py

@@ -16,9 +16,7 @@
 author_email = '[email protected]'
 license = 'BSD'
 install_requires = [
-    "django-model-utils==2.3.1",
-    "django-uuidfield==0.5.0",
-    "jsonfield==1.0.3",
+    "jsonfield==2.0.2",
     "Django>=1.7",
     "simplesignals==0.3.0",
 ]

setup.py

@@ -1,4 +1,6 @@
 -r requirements.txt
-pymysql==0.7.11
+mysqlclient==1.4.6
 freezegun==0.3.12
 mock==3.0.5
+dj-database-url==0.5.0
+psycopg2==2.8.4

test-requirements.txt

@@ -1,13 +1,8 @@
 import os
-import pymysql
-pymysql.install_as_MySQLdb()
+import dj_database_url
 
 DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.mysql',
-        'NAME': 'django_db_queue',
-        'PORT': os.getenv('DATABASE_PORT', 3306),
-    },
+    'default': dj_database_url.parse(os.environ['DATABASE_URL']),
 }
 
 INSTALLED_APPS = (