mirror of
https://github.com/django-q2/django-q2.git
synced 2026-10-03 20:58:12 +08:00
removes root imports for django 1.9
Updated docs to promote submodule imports
This commit is contained in:
+12
-7
@@ -1,15 +1,20 @@
|
||||
import os
|
||||
import sys
|
||||
from django import get_version
|
||||
|
||||
myPath = os.path.dirname(os.path.abspath(__file__))
|
||||
sys.path.insert(0, myPath)
|
||||
|
||||
from .tasks import async, schedule, result, result_group, fetch, fetch_group, count_group, delete_group, queue_size
|
||||
from .models import Task, Schedule, Success, Failure
|
||||
from .cluster import Cluster
|
||||
from .status import Stat
|
||||
from .brokers import get_broker
|
||||
|
||||
VERSION = (0, 7, 3)
|
||||
VERSION = (0, 7, 4)
|
||||
|
||||
default_app_config = 'django_q.apps.DjangoQConfig'
|
||||
|
||||
# root imports will slowly be deprecated.
|
||||
# please import from the relevant sub modules
|
||||
if get_version().split('.')[1][0] != '9':
|
||||
from .tasks import async, schedule, result, result_group, fetch, fetch_group, count_group, delete_group, queue_size
|
||||
from .models import Task, Schedule, Success, Failure
|
||||
from .cluster import Cluster
|
||||
from .status import Stat
|
||||
from .brokers import get_broker
|
||||
|
||||
|
||||
@@ -2,8 +2,8 @@ import sys
|
||||
from multiprocessing import Queue, Event, Value
|
||||
import threading
|
||||
from time import sleep
|
||||
|
||||
import os
|
||||
|
||||
import pytest
|
||||
|
||||
myPath = os.path.dirname(os.path.abspath(__file__))
|
||||
@@ -226,8 +226,10 @@ def test_async(broker, admin_user):
|
||||
assert result_j.group_count(failures=True) == 0
|
||||
assert delete_group('test_j') == 1
|
||||
assert result_j.group_delete() == 0
|
||||
assert delete_group('test_j', tasks=True) is None
|
||||
assert result_j.group_delete(tasks=True) is None
|
||||
deleted_group = delete_group('test_j', tasks=True)
|
||||
assert deleted_group is None or deleted_group[0] == 0 # Django 1.9
|
||||
deleted_group = result_j.group_delete(tasks=True)
|
||||
assert delete_group is None or deleted_group[0] == 0 # Django 1.9
|
||||
# task k should not have been saved
|
||||
assert fetch(k) is None
|
||||
assert fetch(k, 100) is None
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import pytest
|
||||
|
||||
from django_q import async, get_broker
|
||||
from django_q.tasks import async
|
||||
from django_q.brokers import get_broker
|
||||
from django_q.cluster import Cluster
|
||||
from django_q.monitor import monitor, info
|
||||
from django_q.status import Stat
|
||||
|
||||
Reference in New Issue
Block a user