diff --git a/README.md b/README.md
index 7cce49155e..a264ceefc8 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ Available addons
addon | version | maintainers | summary
--- | --- | --- | ---
[base_import_async](base_import_async/) | 18.0.1.0.0 | | Import CSV files in the background
-[queue_job](queue_job/) | 18.0.1.4.1 |
| Job Queue
+[queue_job](queue_job/) | 18.0.1.4.2 |
| Job Queue
[queue_job_batch](queue_job_batch/) | 18.0.1.0.0 | | Job Queue Batch
[queue_job_cron](queue_job_cron/) | 18.0.1.1.0 | | Scheduled Actions as Queue Jobs
[queue_job_cron_jobrunner](queue_job_cron_jobrunner/) | 18.0.1.0.0 |
| Run jobs without a dedicated JobRunner
diff --git a/queue_job/README.rst b/queue_job/README.rst
index 7f7b08ccf1..2a9f7f0b59 100644
--- a/queue_job/README.rst
+++ b/queue_job/README.rst
@@ -11,7 +11,7 @@ Job Queue
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- !! source digest: sha256:fafa81e5bc8c9180e7e3b5b3b075433ecd9d068ad20f767679e747bec540328e
+ !! source digest: sha256:285d0c064d250ff0c5b9e9c6ab4ced7664c95a34e09a39f0cf6838f441a36bb2
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Mature-brightgreen.png
diff --git a/queue_job/__manifest__.py b/queue_job/__manifest__.py
index 4fbb5006ad..6a891169f4 100644
--- a/queue_job/__manifest__.py
+++ b/queue_job/__manifest__.py
@@ -2,7 +2,7 @@
{
"name": "Job Queue",
- "version": "18.0.1.4.1",
+ "version": "18.0.1.4.2",
"author": "Camptocamp,ACSONE SA/NV,Odoo Community Association (OCA)",
"website": "https://github.com/OCA/queue",
"license": "LGPL-3",
diff --git a/queue_job/job.py b/queue_job/job.py
index 31226303c7..e472d70db9 100644
--- a/queue_job/job.py
+++ b/queue_job/job.py
@@ -9,7 +9,6 @@
import uuid
import weakref
from datetime import datetime, timedelta
-from functools import total_ordering
from random import randint
import odoo
@@ -91,7 +90,6 @@ def identity_exact_hasher(job_):
return hasher
-@total_ordering
class Job:
"""A Job is a task to execute. It is the in-memory representation of a job.
@@ -297,65 +295,6 @@ def job_record_with_same_identity_key(self):
)
return existing
- # TODO to deprecate (not called anymore)
- @classmethod
- def enqueue(
- cls,
- func,
- args=None,
- kwargs=None,
- priority=None,
- eta=None,
- max_retries=None,
- description=None,
- channel=None,
- identity_key=None,
- ):
- """Create a Job and enqueue it in the queue. Return the job uuid.
-
- This expects the arguments specific to the job to be already extracted
- from the ones to pass to the job function.
-
- If the identity key is the same than the one in a pending job,
- no job is created and the existing job is returned
-
- """
- new_job = cls(
- func=func,
- args=args,
- kwargs=kwargs,
- priority=priority,
- eta=eta,
- max_retries=max_retries,
- description=description,
- channel=channel,
- identity_key=identity_key,
- )
- return new_job._enqueue_job()
-
- # TODO to deprecate (not called anymore)
- def _enqueue_job(self):
- if self.identity_key:
- existing = self.job_record_with_same_identity_key()
- if existing:
- _logger.debug(
- "a job has not been enqueued due to having "
- "the same identity key (%s) than job %s",
- self.identity_key,
- existing.uuid,
- )
- return Job._load_from_db_record(existing)
- self.store()
- _logger.debug(
- "enqueued %s:%s(*%r, **%r) with uuid: %s",
- self.recordset,
- self.method_name,
- self.args,
- self.kwargs,
- self.uuid,
- )
- return self
-
@staticmethod
def db_records_from_uuids(env, job_uuids):
model = env["queue.job"].sudo()
@@ -673,16 +612,6 @@ def __eq__(self, other):
def __hash__(self):
return self.uuid.__hash__()
- def sorting_key(self):
- return self.eta, self.priority, self.date_created, self.seq
-
- def __lt__(self, other):
- if self.eta and not other.eta:
- return True
- elif not self.eta and other.eta:
- return False
- return self.sorting_key() < other.sorting_key()
-
def db_record(self):
return self.db_records_from_uuids(self.env, [self.uuid])
diff --git a/queue_job/static/description/index.html b/queue_job/static/description/index.html
index 0cfe88cddb..1783864e00 100644
--- a/queue_job/static/description/index.html
+++ b/queue_job/static/description/index.html
@@ -372,7 +372,7 @@
This addon adds an integrated Job Queue to Odoo.