mirror of
https://github.com/django-q2/django-q2.git
synced 2026-10-02 15:28:12 +08:00
Fixes deprecated arrow syntax
This commit is contained in:
+7
-7
@@ -514,19 +514,19 @@ def scheduler(broker=None):
|
|||||||
next_run = arrow.get(s.next_run)
|
next_run = arrow.get(s.next_run)
|
||||||
while True:
|
while True:
|
||||||
if s.schedule_type == s.MINUTES:
|
if s.schedule_type == s.MINUTES:
|
||||||
next_run = next_run.replace(minutes=+(s.minutes or 1))
|
next_run = next_run.shift(minutes=+(s.minutes or 1))
|
||||||
elif s.schedule_type == s.HOURLY:
|
elif s.schedule_type == s.HOURLY:
|
||||||
next_run = next_run.replace(hours=+1)
|
next_run = next_run.shift(hours=+1)
|
||||||
elif s.schedule_type == s.DAILY:
|
elif s.schedule_type == s.DAILY:
|
||||||
next_run = next_run.replace(days=+1)
|
next_run = next_run.shift(days=+1)
|
||||||
elif s.schedule_type == s.WEEKLY:
|
elif s.schedule_type == s.WEEKLY:
|
||||||
next_run = next_run.replace(weeks=+1)
|
next_run = next_run.shift(weeks=+1)
|
||||||
elif s.schedule_type == s.MONTHLY:
|
elif s.schedule_type == s.MONTHLY:
|
||||||
next_run = next_run.replace(months=+1)
|
next_run = next_run.shift(months=+1)
|
||||||
elif s.schedule_type == s.QUARTERLY:
|
elif s.schedule_type == s.QUARTERLY:
|
||||||
next_run = next_run.replace(months=+3)
|
next_run = next_run.shift(months=+3)
|
||||||
elif s.schedule_type == s.YEARLY:
|
elif s.schedule_type == s.YEARLY:
|
||||||
next_run = next_run.replace(years=+1)
|
next_run = next_run.shift(years=+1)
|
||||||
if Conf.CATCH_UP or next_run > arrow.utcnow():
|
if Conf.CATCH_UP or next_run > arrow.utcnow():
|
||||||
break
|
break
|
||||||
s.next_run = next_run.datetime
|
s.next_run = next_run.datetime
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ def test_scheduler(broker, monkeypatch):
|
|||||||
assert schedule.repeats == 0
|
assert schedule.repeats == 0
|
||||||
assert schedule.last_run() is not None
|
assert schedule.last_run() is not None
|
||||||
assert schedule.success() is True
|
assert schedule.success() is True
|
||||||
assert schedule.next_run < arrow.get(timezone.now()).replace(hours=+1)
|
assert schedule.next_run < arrow.get(timezone.now()).shift(hours=+1)
|
||||||
task = fetch(schedule.task)
|
task = fetch(schedule.task)
|
||||||
assert task is not None
|
assert task is not None
|
||||||
assert task.success is True
|
assert task.success is True
|
||||||
|
|||||||
Reference in New Issue
Block a user