Revert "Initial changes for Django 6.0's tasks framework"

This reverts commit 6bc77cf.

Author: codingjoe

.github/CODEOWNERS

@@ -0,0 +1,6 @@
+# Dependencies
+## Python
+pyproject.toml @herrbenesch @amureki
+## GitHub Actions
+.github/workflows/ci.yml @herrbenesch @amureki
+.github/workflows/release.yml @herrbenesch @amureki

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+github:
+  - amureki
+  - codingjoe

.github/dependabot.yml

@@ -3,8 +3,8 @@ updates:
   - package-ecosystem: pip
     directory: "/"
     schedule:
-      interval: weekly
+      interval: daily
   - package-ecosystem: github-actions
     directory: "/"
     schedule:
-      interval: weekly
+      interval: daily

.github/workflows/ci.yml

@@ -24,15 +24,24 @@ jobs:
         os:
           - "ubuntu-latest"
         python-version:
+          - "3.10"
+          - "3.11"
           - "3.12"
           - "3.13"
-          - "3.14"
         django-version:
-          - "6.0"
+          - "4.2" # LTS
+          - "5.1"
+          - "5.2"
         extras:
           - "test"
           - "test,sentry"
           - "test,redis"
+        include:
+          # 4.2 is the last version to support Python 3.9
+          - os: "ubuntu-latest"
+            python-version: "3.9"
+            django-version: "4.2"
+            extras: "test"
     services:
       redis:
         image: redis

.gitignore

@@ -131,4 +131,4 @@ dmypy.json
 
 # Packaging
 
-crontask/_version.py
+dramatiq_crontab/_version.py

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2025, Johannes Maron, voiio GmbH & contributors
+Copyright (c) 2023, voiio GmbH
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

README.md

@@ -1,47 +1,41 @@
-# Django CronTask
+# Dramatiq Crontab
 
-<p align="center">
-  <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="./images/logo-dark.svg">
-    <source media="(prefers-color-scheme: light)" srcset="./images/logo-light.svg">
-    <img alt="esimport: Blazing fast ESM compiler and importmap generator" src="./images/logo-light.svg">
-  </picture>
-</p>
+![dramtiq-crontab logo: person in front of a schedule](https://raw.githubusercontent.com/voiio/dramatiq-crontab/main/dramatiq-crontab.png)
 
-**Cron style scheduler for asynchronous tasks in Django.**
+**Cron style scheduler for asynchronous Dramatiq tasks in Django.**
 
 - setup recurring tasks via crontab syntax
-- lightweight helpers build [APScheduler]
+- lightweight helpers build on robust tools like [Dramatiq] and [APScheduler]
 - [Sentry] cron monitor support
 
-[![PyPi Version](https://img.shields.io/pypi/v/django-crontask.svg)](https://pypi.python.org/pypi/django-crontask/)
-[![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)
+[![PyPi Version](https://img.shields.io/pypi/v/dramatiq-crontab.svg)](https://pypi.python.org/pypi/dramatiq-crontab/)
+[![Test Coverage](https://codecov.io/gh/voiio/dramatiq-crontab/branch/main/graph/badge.svg)](https://codecov.io/gh/voiio/dramatiq-crontab)
+[![GitHub License](https://img.shields.io/github/license/voiio/dramatiq-crontab)](https://raw.githubusercontent.com/voiio/dramatiq-crontab/master/LICENSE)
 
 ## Setup
 
-You need to have [Django's Task framework][django-tasks] setup properly.
+You need to have [Dramatiq] installed and setup properly.
 
 ```ShellSession
-python3 -m pip install django-crontask
+python3 -m pip install dramatiq-crontab
 # or
-python3 -m pip install django-crontask[sentry]  # with sentry cron monitor support
+python3 -m pip install dramatiq-crontab[sentry]  # with sentry cron monitor support
 ```
 
-Add `crontask` to your `INSTALLED_APPS` in `settings.py`:
+Add `dramatiq_crontab` to your `INSTALLED_APPS` in `settings.py`:
 
 ```python
 # settings.py
 INSTALLED_APPS = [
-    "crontask",
+    "dramatiq_crontab",
     # ...
 ]
 ```
 
 Finally, you lauch the scheduler in a separate process:
 
 ```ShellSession
-python3 manage.py crontask
+python3 manage.py crontab
 ```
 
 ### Setup Redis as a lock backend (optional)
@@ -53,7 +47,7 @@ instances of your application running.
 
 ```python
 # settings.py
-CRONTASK = {
+DRAMATIQ_CRONTAB = {
     "REDIS_URL": "redis://localhost:6379/0",
 }
 ```
@@ -62,12 +56,12 @@ CRONTASK = {
 
 ```python
 # tasks.py
-from django.tasks import task
-from crontask import cron
+import dramatiq
+from dramatiq_crontab import cron
 
 
 @cron("*/5 * * * *")  # every 5 minutes
-@task
+@dramatiq.actor
 def my_task():
     my_task.logger.info("Hello World")
 ```
@@ -79,12 +73,12 @@ If you want to run a task more frequently than once a minute, you can use the
 
 ```python
 # tasks.py
-from django.tasks import task
-from crontask import interval
+import dramatiq
+from dramatiq_crontab import interval
 
 
 @interval(seconds=30)
-@task
+@dramatiq.actor
 def my_task():
     my_task.logger.info("Hello World")
 ```
@@ -107,7 +101,7 @@ usage: manage.py crontab [-h] [--no-task-loading] [--no-heartbeat] [--version] [
                          [--settings SETTINGS] [--pythonpath PYTHONPATH] [--traceback] [--no-color]
                          [--force-color] [--skip-checks]
 
-Run task scheduler for all tasks with the `cron` decorator.
+Run dramatiq task scheduler for all tasks with the `cron` decorator.
 
 options:
   -h, --help            show this help message and exit
@@ -116,5 +110,5 @@ options:
 ```
 
 [apscheduler]: https://apscheduler.readthedocs.io/en/stable/
-[django-tasks]: https://docs.djangoproject.com/en/6.0/topics/tasks/
+[dramatiq]: https://dramatiq.io/
 [sentry]: https://docs.sentry.io/product/crons/

crontask/tasks.py

@@ -1,4 +1,4 @@
-"""Cron style scheduler for Django's task framework."""
+"""Cron style scheduler for asynchronous Dramatiq tasks in Django."""
 
 from unittest.mock import Mock
 
@@ -42,7 +42,7 @@ def cron(schedule):
 
     Usage:
         @cron("0 0 * * *")
-        @task
+        @dramatiq.actor
         def cron_test():
             print("Cron test")
 
@@ -55,7 +55,7 @@ def cron_test():
     The monitors timezone should be set to Europe/Berlin.
     """
 
-    def decorator(task):
+    def decorator(actor):
         *_, day_schedule = schedule.split(" ")
 
         # CronTrigger uses Python's timezone dependent first weekday,
@@ -67,26 +67,19 @@ def decorator(task):
             )
 
         if monitor is not None:
-            task = type(task)(
-                priority=task.priority,
-                func=monitor(task.name)(task.func),
-                queue_name=task.queue_name,
-                backend=task.backend,
-                takes_context=task.takes_context,
-                run_after=task.run_after,
-            )
+            actor.fn = monitor(actor.actor_name)(actor.fn)
 
         scheduler.add_job(
-            task.enqueue,
+            actor.send,
             CronTrigger.from_crontab(
                 schedule,
                 timezone=timezone.get_default_timezone(),
             ),
-            name=task.name,
+            name=actor.actor_name,
         )
         # We don't add the Sentry monitor on the actor itself, because we only want to
         # monitor the cron job, not the actor itself, or it's direct invocations.
-        return task
+        return actor
 
     return decorator
 
@@ -97,7 +90,7 @@ def interval(*, seconds):
 
     Usage:
         @interval(seconds=30)
-        @task
+        @dramatiq.actor
         def interval_test():
             print("Interval test")
 
@@ -109,25 +102,18 @@ def interval_test():
     For an interval that is consistent with the clock, use the `cron` decorator instead.
     """
 
-    def decorator(task):
+    def decorator(actor):
         if monitor is not None:
-            task = type(task)(
-                priority=task.priority,
-                func=monitor(task.name)(task.func),
-                queue_name=task.queue_name,
-                backend=task.backend,
-                takes_context=task.takes_context,
-                run_after=task.run_after,
-            )
+            actor.fn = monitor(actor.actor_name)(actor.fn)
 
         scheduler.add_job(
-            task.enqueue,
+            actor.send,
             IntervalTrigger(
                 seconds=seconds,
                 timezone=timezone.get_default_timezone(),
             ),
-            name=task.name,
+            name=actor.actor_name,
         )
-        return task
+        return actor
 
     return decorator

crontask/__init__.py dramatiq_crontab/__init__.pycrontask/__init__.py renamed to dramatiq_crontab/__init__.py

@@ -12,6 +12,6 @@ def get_settings():
             "LOCK_REFRESH_INTERVAL": 5,
             "LOCK_TIMEOUT": 10,
             "LOCK_BLOCKING_TIMEOUT": 15,
-            **getattr(settings, "CRONTASK", {}),
+            **getattr(settings, "DRAMATIQ_CRONTAB", {}),
         },
     )