mirror of
https://github.com/django-q2/django-q2.git
synced 2026-10-06 05:08:11 +08:00
Moves optional import to root
This commit is contained in:
@@ -1,6 +1,12 @@
|
|||||||
VERSION = (1, 2, 4)
|
VERSION = (1, 2, 4)
|
||||||
|
|
||||||
default_app_config = 'django_q.apps.DjangoQConfig'
|
default_app_config = "django_q.apps.DjangoQConfig"
|
||||||
|
|
||||||
|
|
||||||
__all__ = ['conf', 'cluster', 'models', 'tasks']
|
__all__ = ["conf", "cluster", "models", "tasks", "croniter"]
|
||||||
|
|
||||||
|
# Optional Imports
|
||||||
|
try:
|
||||||
|
from croniter import croniter
|
||||||
|
except ImportError:
|
||||||
|
croniter = None
|
||||||
|
|||||||
+2
-3
@@ -5,6 +5,7 @@ from django.utils.translation import gettext_lazy as _
|
|||||||
from django_q.conf import Conf
|
from django_q.conf import Conf
|
||||||
from django_q.models import Success, Failure, Schedule, OrmQ
|
from django_q.models import Success, Failure, Schedule, OrmQ
|
||||||
from django_q.tasks import async_task
|
from django_q.tasks import async_task
|
||||||
|
from django_q import croniter
|
||||||
|
|
||||||
|
|
||||||
class TaskAdmin(admin.ModelAdmin):
|
class TaskAdmin(admin.ModelAdmin):
|
||||||
@@ -74,9 +75,7 @@ class ScheduleAdmin(admin.ModelAdmin):
|
|||||||
)
|
)
|
||||||
|
|
||||||
# optional cron strings
|
# optional cron strings
|
||||||
try:
|
if not croniter:
|
||||||
from croniter import croniter
|
|
||||||
except ImportError:
|
|
||||||
readonly_fields = ("cron",)
|
readonly_fields = ("cron",)
|
||||||
|
|
||||||
list_filter = ("next_run", "schedule_type")
|
list_filter = ("next_run", "schedule_type")
|
||||||
|
|||||||
+1
-1
@@ -4,7 +4,7 @@ from django_q.conf import Conf
|
|||||||
|
|
||||||
|
|
||||||
class DjangoQConfig(AppConfig):
|
class DjangoQConfig(AppConfig):
|
||||||
name = 'django_q'
|
name = "django_q"
|
||||||
verbose_name = Conf.LABEL
|
verbose_name = Conf.LABEL
|
||||||
|
|
||||||
def ready(self):
|
def ready(self):
|
||||||
|
|||||||
+1
-6
@@ -26,12 +26,7 @@ from django_q.queues import Queue
|
|||||||
from django_q.signals import pre_execute
|
from django_q.signals import pre_execute
|
||||||
from django_q.signing import SignedPackage, BadSignature
|
from django_q.signing import SignedPackage, BadSignature
|
||||||
from django_q.status import Stat, Status
|
from django_q.status import Stat, Status
|
||||||
|
from django_q import croniter
|
||||||
# Optional
|
|
||||||
try:
|
|
||||||
from croniter import croniter
|
|
||||||
except ImportError:
|
|
||||||
croniter = None
|
|
||||||
|
|
||||||
|
|
||||||
class Cluster:
|
class Cluster:
|
||||||
|
|||||||
+1
-6
@@ -14,12 +14,7 @@ from picklefield.fields import dbsafe_decode
|
|||||||
|
|
||||||
# Local
|
# Local
|
||||||
from django_q.signing import SignedPackage
|
from django_q.signing import SignedPackage
|
||||||
|
from django_q import croniter
|
||||||
# Optional
|
|
||||||
try:
|
|
||||||
from croniter import croniter
|
|
||||||
except ImportError:
|
|
||||||
croniter = None
|
|
||||||
|
|
||||||
|
|
||||||
class Task(models.Model):
|
class Task(models.Model):
|
||||||
|
|||||||
Reference in New Issue
Block a user