From 9d148f28131da0ccda8606d8ddc271963f952ac6 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Mon, 12 Feb 2024 08:43:11 +0100 Subject: [PATCH 1/3] Remove code for unsupported django.VERSION < (3, 2) --- django_celery_beat/__init__.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/django_celery_beat/__init__.py b/django_celery_beat/__init__.py index c1180859..bd9e0b28 100644 --- a/django_celery_beat/__init__.py +++ b/django_celery_beat/__init__.py @@ -5,8 +5,6 @@ import re from collections import namedtuple -import django - __version__ = '2.5.0' __author__ = 'Asif Saif Uddin, Ask Solem' __contact__ = 'auvipy@gmail.com, ask@celeryproject.org' @@ -29,6 +27,3 @@ del re __all__ = [] - -if django.VERSION < (3, 2): - default_app_config = 'django_celery_beat.apps.BeatConfig' From 4717a994363e49cbdf01f271ffd6b728f0b02480 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Mon, 12 Feb 2024 08:47:16 +0100 Subject: [PATCH 2/3] pre-commit: Add django-upgrade --- .pre-commit-config.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5b781d72..50914378 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -30,3 +30,9 @@ repos: rev: 5.13.2 hooks: - id: isort + + - repo: https://github.com/adamchainz/django-upgrade + rev: 1.16.0 + hooks: + - id: django-upgrade + args: [--target-version, "3.2"] From 730c705c7e121f86ac735dc2fd7ae007c5257968 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 07:47:33 +0000 Subject: [PATCH 3/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- django_celery_beat/admin.py | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/django_celery_beat/admin.py b/django_celery_beat/admin.py index add96779..1da5fd65 100644 --- a/django_celery_beat/admin.py +++ b/django_celery_beat/admin.py @@ -105,6 +105,7 @@ def clean_kwargs(self): return self._clean_json('kwargs') +@admin.register(PeriodicTask) class PeriodicTaskAdmin(admin.ModelAdmin): """Admin-interface for periodic tasks.""" @@ -184,17 +185,21 @@ def _message_user_about_update(self, request, rows_updated, verb): ), ) + @admin.action( + description=_('Enable selected tasks') + ) def enable_tasks(self, request, queryset): rows_updated = queryset.update(enabled=True) PeriodicTasks.update_changed() self._message_user_about_update(request, rows_updated, 'enabled') - enable_tasks.short_description = _('Enable selected tasks') + @admin.action( + description=_('Disable selected tasks') + ) def disable_tasks(self, request, queryset): rows_updated = queryset.update(enabled=False, last_run_at=None) PeriodicTasks.update_changed() self._message_user_about_update(request, rows_updated, 'disabled') - disable_tasks.short_description = _('Disable selected tasks') def _toggle_tasks_activity(self, queryset): return queryset.update(enabled=Case( @@ -202,12 +207,17 @@ def _toggle_tasks_activity(self, queryset): default=Value(True), )) + @admin.action( + description=_('Toggle activity of selected tasks') + ) def toggle_tasks(self, request, queryset): rows_updated = self._toggle_tasks_activity(queryset) PeriodicTasks.update_changed() self._message_user_about_update(request, rows_updated, 'toggled') - toggle_tasks.short_description = _('Toggle activity of selected tasks') + @admin.action( + description=_('Run selected tasks') + ) def run_tasks(self, request, queryset): self.celery_app.loader.import_default_modules() tasks = [(self.celery_app.tasks.get(task.task), @@ -249,9 +259,9 @@ def run_tasks(self, request, queryset): pluralize(tasks_run, _('was,were')), ), ) - run_tasks.short_description = _('Run selected tasks') +@admin.register(ClockedSchedule) class ClockedScheduleAdmin(admin.ModelAdmin): """Admin-interface for clocked schedules.""" @@ -263,6 +273,7 @@ class ClockedScheduleAdmin(admin.ModelAdmin): ) +@admin.register(CrontabSchedule) class CrontabScheduleAdmin(admin.ModelAdmin): """Admin class for CrontabSchedule.""" @@ -270,7 +281,4 @@ class CrontabScheduleAdmin(admin.ModelAdmin): admin.site.register(IntervalSchedule) -admin.site.register(CrontabSchedule, CrontabScheduleAdmin) admin.site.register(SolarSchedule) -admin.site.register(ClockedSchedule, ClockedScheduleAdmin) -admin.site.register(PeriodicTask, PeriodicTaskAdmin)