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

Author: milind-shakya-sp

.bumpversion.cfg

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

Changelog

@@ -4,6 +4,16 @@
  Change history
 ================
 
+.. _version-1.4.0:
+
+1.4.0
+=====
+:release-date: 2018-12-09 1:30 p.m. UTC+2:00
+:release-by: Omer Katz
+
+- Fix migrations dependencies.
+- Added the DJANGO_CELERY_BEAT_TZ_AWARE setting.
+
 .. _version-1.3.0:
 
 1.3.0

README.rst

@@ -8,7 +8,7 @@
 
 |build-status| |coverage| |license| |wheel| |pyversion| |pyimp|
 
-:Version: 1.3.0
+:Version: 1.4.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

@@ -10,7 +10,7 @@
 
 from collections import namedtuple
 
-__version__ = '1.3.0'
+__version__ = '1.4.0+singleplatform.1'
 __author__ = 'Ask Solem'
 __contact__ = '[email protected]'
 __homepage__ = 'https://github.com/celery/django-celery-beat'

django_celery_beat/models.py

@@ -108,6 +108,15 @@ def __str__(self):
         )
 
 
+class TZNaiveSchedule(schedules.schedule):
+
+    def maybe_make_aware(self, dt):
+        """
+        Overriding the base method, to be a no-op and returning the dt as is.
+        """
+        return dt
+
+
 @python_2_unicode_compatible
 class IntervalSchedule(models.Model):
     """Schedule executing every n seconds."""
@@ -134,10 +143,15 @@ class Meta:
 
     @property
     def schedule(self):
-        return schedules.schedule(
+        _schedule = TZNaiveSchedule(
             timedelta(**{self.period: self.every}),
-            nowfun=lambda: make_aware(now())
         )
+        if getattr(settings, 'DJANGO_CELERY_BEAT_TZ_AWARE', True):
+            _schedule = schedules.schedule(
+                timedelta(**{self.period: self.every}),
+                nowfun=lambda: make_aware(now())
+            )
+        return _schedule
 
     @classmethod
     def from_schedule(cls, schedule, period=SECONDS):

docs/includes/introduction.txt

@@ -1,4 +1,4 @@
-:Version: 1.3.0
+:Version: 1.4.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