update django/celery

pandora/archive/queue.py

@@ -1,11 +1,9 @@
 # -*- coding: utf-8 -*-
 
 from datetime import datetime
-from time import time
-
-import celery.task.control
-import kombu.five
+from time import time, monotonic
 
+from app.celery import app
 
 from .models import File
 
@@ -18,7 +16,7 @@ def parse_job(job):
         'file': f.oshash
     }
     if job['time_start']:
-        start_time = datetime.fromtimestamp(time() - (kombu.five.monotonic() - job['time_start']))
+        start_time = datetime.fromtimestamp(time() - (monotonic() - job['time_start']))
         r.update({
             'started': start_time,
             'running': (datetime.now() - start_time).total_seconds()
@@ -30,7 +28,7 @@ def parse_job(job):
 def status():
     status = []
     encoding_jobs = ('archive.tasks.extract_stream', 'archive.tasks.process_stream')
-    c = celery.task.control.inspect()
+    c = app.control.inspect()
     for job in c.active(safe=True).get('celery@pandora-encoding', []):
         if job['name'] in encoding_jobs:
             status.append(parse_job(job))

pandora/oxdjango/fields.py

@@ -5,12 +5,12 @@ import copy
 
 from django.db import models
 from django.utils import datetime_safe
-import django.contrib.postgres.fields
 from django.core.serializers.json import DjangoJSONEncoder
 
 from ox.utils import json
 
-class JSONField(django.contrib.postgres.fields.JSONField):
+
+class JSONField(models.JSONField):
 
     def __init__(self, *args, **kwargs):
         if 'encoder' not in kwargs:

pandora/oxdjango/query.py

@@ -37,12 +37,12 @@ class NullsLastQuery(Query):
         obj.nulls_last = self.nulls_last
         return obj
 
-    def get_compiler(self, using=None, connection=None):
+    def get_compiler(self, using=None, connection=None, elide_empty=True):
         if using is None and connection is None:
             raise ValueError("Need either using or connection")
         if using:
             connection = connections[using]
-        return NullLastSQLCompiler(self, connection, using)
+        return NullLastSQLCompiler(self, connection, using, elide_empty)
 
 class QuerySet(django.db.models.query.QuerySet):
 

pandora/taskqueue/models.py

@@ -8,10 +8,11 @@ from django.contrib.auth import get_user_model
 from django.conf import settings
 from django.db import models
 from django.db.models import Q
-import celery.task.control
-import kombu.five
 import ox
 
+from app.celery import app
+
+
 User = get_user_model()
 
 def get_tasks(username):
@@ -111,7 +112,7 @@ class Task(models.Model):
         return False
 
     def get_job(self):
-        c = celery.task.control.inspect()
+        c = app.control.inspect()
         active = c.active(safe=True)
         if active:
             for queue in active: