Merge branch 'master' of https://github.com/celery/django-celery-beat

Author: auvipy

django_celery_beat/__init__.py

@@ -6,6 +6,8 @@
 
 from collections import namedtuple
 
+import django
+
 __version__ = '2.2.0'
 __author__ = 'Asif Saif Uddin, Ask Solem'
 __contact__ = '[email protected], [email protected]'
@@ -29,4 +31,5 @@
 
 __all__ = []
 
-default_app_config = 'django_celery_beat.apps.BeatConfig'
+if django.VERSION < (3, 2):
+    default_app_config = 'django_celery_beat.apps.BeatConfig'

docs/includes/introduction.txt

@@ -207,9 +207,13 @@ Both the worker and beat services need to be running at the same time.
         $ celery -A [project-name] beat -l info --scheduler django_celery_beat.schedulers:DatabaseScheduler
 
 
-  **OR** you can use the -S (scheduler flag), for more options see ``celery beat --help ``)::
+  **OR** you can use the -S (scheduler flag), for more options see ``celery beat --help``)::
 
             $ celery -A [project-name] beat -l info -S django
+            
+  **OR** you can set the scheduler through Django's settings::
+  
+            CELERY_BEAT_SCHEDULER = 'django_celery_beat.schedulers:DatabaseScheduler'
 
 
 Also, as an alternative, you can run the two steps above (worker and beat services)

requirements/default.txt

@@ -1,3 +1,3 @@
-celery>=4.4,<6.0
+celery>=5.0,<6.0
 django-timezone-field>=4.1.0,<5.0
 python-crontab>=2.3.4