django-crontask 1.3.0__tar.gz → 2.0.1__tar.gz

{django_crontask-1.3.0 → django_crontask-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-crontask
-Version: 1.3.0
+Version: 2.0.1
 Summary: Cron style scheduler for Django's task framework.
 Keywords: Django,cron,tasks,scheduler
 Author-email: Rust Saiargaliev <fly.amureki@gmail.com>, Johannes Maron <johannes@maron.family>, Mostafa Mohamed <mostafa.anm91@gmail.com>, Jacqueline Kraus <jacquelinekraus1992@gmail.com>
@@ -60,8 +60,15 @@ Provides-Extra: sentry
 [![Test Coverage](https://codecov.io/gh/codingjoe/django-crontask/branch/main/graph/badge.svg)](https://codecov.io/gh/codingjoe/django-crontask)
 [![GitHub License](https://img.shields.io/github/license/codingjoe/django-crontask)](https://raw.githubusercontent.com/codingjoe/django-crontask/master/LICENSE)
 
+## Sponsors
+
+[![Sponsors](https://sponsor.pics/codingjoe/django-crontask.svg)](https://github.com/sponsors/codingjoe)
+
 ## Setup
 
+> [!NOTE]
+> Still need a reliable task backend? Check out [Threadmill]!
+
 You need to have [Django's Task framework][django-tasks] setup properly.
 
 ```ShellSession
@@ -152,11 +159,11 @@ The monitor's slug will be the actor's name. Like `my_task` in the example above
 Certain triggers are not supported by Sentry as well as sub-minute intervals.
 In these cases, no monitor will be created and no telemetry will be sent.
 
-Pass a custom config via `sentry_monitor_config` or set it to `False`
+Pass a custom config via `sentry_monitor_config` or set it to `None`
 to disable Sentry monitoring for a single task:
 
 ```python
-@cron("* * * * *", sentry_monitor_config=False)
+@cron("* * * * *", sentry_monitor_config=None)
 @task
 def my_task_without_sentry(): ...
 ```
@@ -180,4 +187,5 @@ options:
 [apscheduler]: https://apscheduler.readthedocs.io/en/stable/
 [django-tasks]: https://docs.djangoproject.com/en/6.0/topics/tasks/
 [sentry]: https://docs.sentry.io/product/crons/
+[threadmill]: https://github.com/codingjoe/threadmill
 

{django_crontask-1.3.0 → django_crontask-2.0.1}/README.md

@@ -18,8 +18,15 @@
 [![Test Coverage](https://codecov.io/gh/codingjoe/django-crontask/branch/main/graph/badge.svg)](https://codecov.io/gh/codingjoe/django-crontask)
 [![GitHub License](https://img.shields.io/github/license/codingjoe/django-crontask)](https://raw.githubusercontent.com/codingjoe/django-crontask/master/LICENSE)
 
+## Sponsors
+
+[![Sponsors](https://sponsor.pics/codingjoe/django-crontask.svg)](https://github.com/sponsors/codingjoe)
+
 ## Setup
 
+> [!NOTE]
+> Still need a reliable task backend? Check out [Threadmill]!
+
 You need to have [Django's Task framework][django-tasks] setup properly.
 
 ```ShellSession
@@ -110,11 +117,11 @@ The monitor's slug will be the actor's name. Like `my_task` in the example above
 Certain triggers are not supported by Sentry as well as sub-minute intervals.
 In these cases, no monitor will be created and no telemetry will be sent.
 
-Pass a custom config via `sentry_monitor_config` or set it to `False`
+Pass a custom config via `sentry_monitor_config` or set it to `None`
 to disable Sentry monitoring for a single task:
 
 ```python
-@cron("* * * * *", sentry_monitor_config=False)
+@cron("* * * * *", sentry_monitor_config=None)
 @task
 def my_task_without_sentry(): ...
 ```
@@ -138,3 +145,4 @@ options:
 [apscheduler]: https://apscheduler.readthedocs.io/en/stable/
 [django-tasks]: https://docs.djangoproject.com/en/6.0/topics/tasks/
 [sentry]: https://docs.sentry.io/product/crons/
+[threadmill]: https://github.com/codingjoe/threadmill

{django_crontask-1.3.0 → django_crontask-2.0.1}/crontask/__init__.py

@@ -1,21 +1,19 @@
 """Cron style scheduler for Django's task framework."""
 
 import typing
-import warnings
 from unittest.mock import Mock
 
 from apscheduler.schedulers.base import STATE_STOPPED
 from apscheduler.schedulers.blocking import BlockingScheduler
 from apscheduler.triggers.base import BaseTrigger
 from apscheduler.triggers.cron import CronTrigger
-from apscheduler.triggers.interval import IntervalTrigger
 from django.tasks import Task
 from django.utils import timezone
 
 from . import _version
 from .contrib import sentry
 
-__all__ = ["cron", "interval", "scheduler", "VERSION", "__version__"]
+__all__ = ["cron", "scheduler", "VERSION", "__version__"]
 
 __version__ = _version.version
 VERSION = _version.version_tuple
@@ -34,12 +32,13 @@ class LazyBlockingScheduler(BlockingScheduler):
 
 
 scheduler = LazyBlockingScheduler()
+UNSET = object()
 
 
 def cron(
     schedule: str | BaseTrigger,
     *,
-    sentry_monitor_config: dict[str, typing.Any] | bool | None = None,
+    sentry_monitor_config: dict[str, dict[str, str | int] | str] | None = UNSET,
 ) -> typing.Callable[[Task], Task]:
     """
     Run task on a scheduler with a cron schedule.
@@ -52,7 +51,7 @@ def cron(
 
     Args:
         schedule: A cron schedule string or an APScheduler trigger.
-        sentry_monitor_config: A Sentry monitor configuration dict or False to disable monitoring.
+        sentry_monitor_config: A Sentry monitor configuration dict or None to disable monitoring.
 
     """
 
@@ -73,11 +72,13 @@ def cron(
         else:
             trigger = schedule
 
-        if sentry_monitor_config is not False:
+        if sentry_monitor_config is not None:
             task = sentry.monitor_cron_task(
                 task,
                 trigger,
-                sentry_monitor_config=sentry_monitor_config,
+                sentry_monitor_config={}
+                if sentry_monitor_config is UNSET
+                else sentry_monitor_config,
             )
 
         scheduler.add_job(
@@ -90,25 +91,3 @@ def cron(
         return task
 
     return decorator
-
-
-def interval(*, seconds):
-    """
-    Run task on a periodic interval.
-
-    The interval decorator is deprecated and will be removed in a future release.
-    Please use the cron decorator with an 'IntervalTrigger' instead.
-    """
-    warnings.warn(
-        "The interval decorator is deprecated and will be removed in a future release. "
-        "Please use the cron decorator with an 'IntervalTrigger' instead.",
-        DeprecationWarning,
-        stacklevel=2,
-    )
-
-    return cron(
-        IntervalTrigger(
-            seconds=seconds,
-            timezone=timezone.get_default_timezone(),
-        )
-    )

{django_crontask-1.3.0 → django_crontask-2.0.1}/crontask/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.3.0'
-__version_tuple__ = version_tuple = (1, 3, 0)
+__version__ = version = '2.0.1'
+__version_tuple__ = version_tuple = (2, 0, 1)
 
-__commit_id__ = commit_id = 'g64b289130'
+__commit_id__ = commit_id = 'gdd8eb0ca2'

{django_crontask-1.3.0 → django_crontask-2.0.1}/crontask/contrib/sentry.py

@@ -65,7 +65,7 @@ def trigger_to_monitor_config(
 def monitor_cron_task(
     task: Task,
     trigger: BaseTrigger,
-    sentry_monitor_config: dict[str, dict[str, str | int] | str] | None = None,
+    sentry_monitor_config: dict[str, dict[str, str | int] | str],
 ) -> Task:
     """
     Wrap the task function in a Sentry monitor for a suitable trigger.

{django_crontask-1.3.0 → django_crontask-2.0.1}/crontask/management/commands/crontask.py

@@ -5,6 +5,7 @@ import sys
 from apscheduler.triggers.interval import IntervalTrigger
 from django.apps import apps
 from django.core.management import BaseCommand
+from django.utils.module_loading import module_has_submodule
 
 from ... import conf, utils
 
@@ -102,4 +103,5 @@ class Command(BaseCommand):
                         f"Loaded tasks from {self.style.NOTICE(app.name)}."
                     )
                 except ImportError:
-                    pass
+                    if module_has_submodule(app.module, "tasks"):
+                        raise