From 9d1ccd299944289d473fa52c482b5712fd48998c Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Fri, 24 Nov 2023 15:03:08 +0530 Subject: [PATCH 1/2] fix: tz aware vs naive comparison (cherry picked from commit 3c83b102ef1f7e4bb6fa151c812a483fc4ebf99a) Signed-off-by: Akhil Narang --- frappe/monitor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/monitor.py b/frappe/monitor.py index e6c4119b28bf..522b743c4c3e 100644 --- a/frappe/monitor.py +++ b/frappe/monitor.py @@ -85,7 +85,7 @@ def collect_job_meta(self, method, kwargs): if job := rq.get_current_job(): self.data.uuid = job.id - waitdiff = self.data.timestamp - job.enqueued_at + waitdiff = self.data.timestamp - job.enqueued_at.replace(tzinfo=pytz.UTC) self.data.job.wait = int(waitdiff.total_seconds() * 1000000) def add_custom_data(self, **kwargs): From 9fa1aa40840194262380a75afd9e0fbcb7c874b7 Mon Sep 17 00:00:00 2001 From: Frappe PR Bot Date: Wed, 23 Oct 2024 16:22:12 +0000 Subject: [PATCH 2/2] chore(release): Bumped to Version 15.45.1 ## [15.45.1](https://github.com/frappe/frappe/compare/v15.45.0...v15.45.1) (2024-10-23) ### Bug Fixes * tz aware vs naive comparison ([9d1ccd2](https://github.com/frappe/frappe/commit/9d1ccd299944289d473fa52c482b5712fd48998c)) --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index fb041b99de73..34a94b317c4d 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -50,7 +50,7 @@ ) from .utils.lazy_loader import lazy_import -__version__ = "15.45.0" +__version__ = "15.45.1" __title__ = "Frappe Framework" controllers = {}