Skip to content

Commit ee3b500

Browse files
Remove code for unsupported django.VERSION < (3, 2) (#729)
* Remove code for unsupported django.VERSION < (3, 2) * pre-commit: Add django-upgrade * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent acd10a3 commit ee3b500

File tree

3 files changed

+21
-12
lines changed

3 files changed

+21
-12
lines changed

.pre-commit-config.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,9 @@ repos:
3030
rev: 5.13.2
3131
hooks:
3232
- id: isort
33+
34+
- repo: https://github.com/adamchainz/django-upgrade
35+
rev: 1.16.0
36+
hooks:
37+
- id: django-upgrade
38+
args: [--target-version, "3.2"]

django_celery_beat/__init__.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import re
66
from collections import namedtuple
77

8-
import django
9-
108
__version__ = '2.5.0'
119
__author__ = 'Asif Saif Uddin, Ask Solem'
1210
@@ -29,6 +27,3 @@
2927
del re
3028

3129
__all__ = []
32-
33-
if django.VERSION < (3, 2):
34-
default_app_config = 'django_celery_beat.apps.BeatConfig'

django_celery_beat/admin.py

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ def clean_kwargs(self):
105105
return self._clean_json('kwargs')
106106

107107

108+
@admin.register(PeriodicTask)
108109
class PeriodicTaskAdmin(admin.ModelAdmin):
109110
"""Admin-interface for periodic tasks."""
110111

@@ -184,30 +185,39 @@ def _message_user_about_update(self, request, rows_updated, verb):
184185
),
185186
)
186187

188+
@admin.action(
189+
description=_('Enable selected tasks')
190+
)
187191
def enable_tasks(self, request, queryset):
188192
rows_updated = queryset.update(enabled=True)
189193
PeriodicTasks.update_changed()
190194
self._message_user_about_update(request, rows_updated, 'enabled')
191-
enable_tasks.short_description = _('Enable selected tasks')
192195

196+
@admin.action(
197+
description=_('Disable selected tasks')
198+
)
193199
def disable_tasks(self, request, queryset):
194200
rows_updated = queryset.update(enabled=False, last_run_at=None)
195201
PeriodicTasks.update_changed()
196202
self._message_user_about_update(request, rows_updated, 'disabled')
197-
disable_tasks.short_description = _('Disable selected tasks')
198203

199204
def _toggle_tasks_activity(self, queryset):
200205
return queryset.update(enabled=Case(
201206
When(enabled=True, then=Value(False)),
202207
default=Value(True),
203208
))
204209

210+
@admin.action(
211+
description=_('Toggle activity of selected tasks')
212+
)
205213
def toggle_tasks(self, request, queryset):
206214
rows_updated = self._toggle_tasks_activity(queryset)
207215
PeriodicTasks.update_changed()
208216
self._message_user_about_update(request, rows_updated, 'toggled')
209-
toggle_tasks.short_description = _('Toggle activity of selected tasks')
210217

218+
@admin.action(
219+
description=_('Run selected tasks')
220+
)
211221
def run_tasks(self, request, queryset):
212222
self.celery_app.loader.import_default_modules()
213223
tasks = [(self.celery_app.tasks.get(task.task),
@@ -249,9 +259,9 @@ def run_tasks(self, request, queryset):
249259
pluralize(tasks_run, _('was,were')),
250260
),
251261
)
252-
run_tasks.short_description = _('Run selected tasks')
253262

254263

264+
@admin.register(ClockedSchedule)
255265
class ClockedScheduleAdmin(admin.ModelAdmin):
256266
"""Admin-interface for clocked schedules."""
257267

@@ -263,14 +273,12 @@ class ClockedScheduleAdmin(admin.ModelAdmin):
263273
)
264274

265275

276+
@admin.register(CrontabSchedule)
266277
class CrontabScheduleAdmin(admin.ModelAdmin):
267278
"""Admin class for CrontabSchedule."""
268279

269280
list_display = ('__str__', 'human_readable')
270281

271282

272283
admin.site.register(IntervalSchedule)
273-
admin.site.register(CrontabSchedule, CrontabScheduleAdmin)
274284
admin.site.register(SolarSchedule)
275-
admin.site.register(ClockedSchedule, ClockedScheduleAdmin)
276-
admin.site.register(PeriodicTask, PeriodicTaskAdmin)

0 commit comments

Comments
 (0)