Moves optional import to root

This commit is contained in:
Ilan Steemers
2020-06-29 19:08:33 +02:00
parent 34293cfcad
commit f0061dccd6
5 changed files with 13 additions and 18 deletions
+8 -2
View File
@@ -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
View File
@@ -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
View File
@@ -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
View File
@@ -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
View File
@@ -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):