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

Author: SunnyCapt

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.1.0
+current_version = 2.2.0
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?P<releaselevel>[a-z]+)?

.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 *.pyc
 *$py.class
+*.mo
 *~
 .*.sw[pon]
 dist/

.travis.yml

@@ -1,5 +1,5 @@
 language: python
-dist: xenial
+dist: bionic
 cache: false
 before_install:
   - sudo apt update
@@ -19,6 +19,7 @@ env:
   - DJANGO=2.2
   - DJANGO=3.0
   - DJANGO=3.1
+  - DJANGO=3.2
 os:
   - linux
 matrix:

Changelog

@@ -4,10 +4,22 @@
  Change history
 ================
 
+2.2.0
+=====
+:release-date: 2021-01-19 2:30 p.m. UTC+6:00
+:release-by: Asif Saif Uddin
+
+- Fixed compatibility with django-timezone-field>=4.1.0
+- Fixed deprecation warnings: 'assertEquals' in tests.
+- Fixed SolarSchedule event choices i18n support.
+- Updated 'es' .po file metadata
+- Update 'fr' .po file metadata
+- New schema migrations for SolarSchedule events choices changes in models.
+
 2.1.0
 =====
 :release-date: 
-:release-by: 
+:release-by: Asif Saif Uddin
 - Fix string representation of CrontabSchedule, so it matches UNIX CRON expression format (#318)
 - If no schedule is selected in PeriodicTask form, raise a non-field error instead of an error bounded to the `interval` field (#327)
 - Fix some Spanish translations (#339)
@@ -19,11 +31,12 @@
 
 2.0.0
 =====
-:release-date: 
-:release-by: 
+:release-date:
+:release-by:
 - Added support for Django 3.0
 - Dropped support for Django < 2.2 and Python < 3.5
 
+
 1.6.0
 =====
 :release-date: 2020-02-01 4:30 p.m. UTC+6:00

MANIFEST.in

@@ -9,7 +9,7 @@ recursive-include docs *
 recursive-include extra/*
 recursive-include examples *
 recursive-include requirements *.txt *.rst
-recursive-include django_celery_beat *.py *.html
+recursive-include django_celery_beat *.py *.html *.po *.mo
 recursive-include t *.py
 
 recursive-exclude * __pycache__

README.rst

@@ -4,7 +4,7 @@
 
 |build-status| |coverage| |license| |wheel| |pyversion| |pyimp|
 
-:Version: 2.1.0
+:Version: 2.2.0
 :Web: http://django-celery-beat.readthedocs.io/
 :Download: http://pypi.python.org/pypi/django-celery-beat
 :Source: http://github.com/celery/django-celery-beat

django_celery_beat/__init__.py

@@ -7,7 +7,7 @@
 
 from collections import namedtuple
 
-__version__ = '2.1.0'
+__version__ = '2.2.0'
 __author__ = 'Asif Saif Uddin, Ask Solem'
 __contact__ = '[email protected], [email protected]'
 __homepage__ = 'https://github.com/celery/django-celery-beat'

django_celery_beat/admin.py

@@ -78,7 +78,7 @@ class Meta:
         exclude = ()
 
     def clean(self):
-        data = super(PeriodicTaskForm, self).clean()
+        data = super().clean()
         regtask = data.get('regtask')
         if regtask:
             data['task'] = regtask
@@ -154,7 +154,7 @@ def changelist_view(self, request, extra_context=None):
             request, extra_context)
 
     def get_queryset(self, request):
-        qs = super(PeriodicTaskAdmin, self).get_queryset(request)
+        qs = super().get_queryset(request)
         return qs.select_related('interval', 'crontab', 'solar', 'clocked')
 
     def _message_user_about_update(self, request, rows_updated, verb):

django_celery_beat/apps.py

@@ -11,3 +11,4 @@ class BeatConfig(AppConfig):
     name = 'django_celery_beat'
     label = 'django_celery_beat'
     verbose_name = _('Periodic Tasks')
+    default_auto_field = 'django.db.models.AutoField'

django_celery_beat/clockedschedule.py

@@ -14,7 +14,7 @@ class clocked(schedules.BaseSchedule):
     def __init__(self, clocked_time, nowfun=None, app=None):
         """Initialize clocked."""
         self.clocked_time = maybe_make_aware(clocked_time)
-        super(clocked, self).__init__(nowfun=nowfun, app=app)
+        super().__init__(nowfun=nowfun, app=app)
 
     def remaining_estimate(self, last_run_at):
         return self.clocked_time - self.now()