[BOT] post-merge updates

OCA · Jan 8, 2024 · 277c953 · 277c953
1 parent a9578d9
commit 277c953
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ addon | version | maintainers | summary
 [base_import_async](base_import_async/) | 16.0.1.1.0 |  | Import CSV files in the background
 [queue_job](queue_job/) | 16.0.2.5.5 | [![guewen](https://github.com/guewen.png?size=30px)](https://github.com/guewen) | Job Queue
 [queue_job_batch](queue_job_batch/) | 16.0.1.0.0 |  | Job Queue Batch
-[queue_job_cron](queue_job_cron/) | 16.0.1.0.0 |  | Scheduled Actions as Queue Jobs
+[queue_job_cron](queue_job_cron/) | 16.0.2.0.0 |  | Scheduled Actions as Queue Jobs
 [queue_job_cron_jobrunner](queue_job_cron_jobrunner/) | 16.0.1.0.0 | [![ivantodorovich](https://github.com/ivantodorovich.png?size=30px)](https://github.com/ivantodorovich) | Run jobs without a dedicated JobRunner
 [queue_job_subscribe](queue_job_subscribe/) | 16.0.1.0.0 |  | Control which users are subscribed to queue job notifications
 [test_queue_job](test_queue_job/) | 16.0.2.2.1 |  | Queue Job Tests

diff --git a/queue_job_cron/README.rst b/queue_job_cron/README.rst
@@ -7,7 +7,7 @@ Scheduled Actions as Queue Jobs
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:b480c9654ed31009970555755c9376fdcaa5746eeeb0fc9415ec99d387ce5605
+   !! source digest: sha256:1b958952dc577556fc8f6149cb6652b2d8c1aba382da774f0f67740833889ac4
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -56,6 +56,24 @@ To configure dedicated channels please refers to queue_job help: https://github.
 Channels can be used to manage sequential jobs and prevent concurrency accesses.
 To do that you just have to define a channel per cron limited to 1 at time.
 
+Changelog
+=========
+
+16.0.2.0.0 (2024-01-08)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+**Features**
+
+- By default prevent parallel run of the same cron job when run as queue job.
+
+  When a cron job is run by odoo, the odoo runner will prevent parallel run
+  of the same cron job. Before this change, this was not the case when the
+  cron job was run as a queue job. A new option is added to the cron job when
+  run as a queue job to prevent parallel run. This option is set to True by
+  default. In this way, the behavior is now the same as when the cron job is run
+  by odoo but you keep the possibility to disable this restriction when run as
+  a queue job. (`#612 <https://github.com/OCA/queue/issues/612>`_)
+
 Bug Tracker
 ===========
 

diff --git a/queue_job_cron/__manifest__.py b/queue_job_cron/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "Scheduled Actions as Queue Jobs",
-    "version": "16.0.1.0.0",
+    "version": "16.0.2.0.0",
     "author": "ACSONE SA/NV,Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/queue",
     "license": "AGPL-3",

diff --git a/queue_job_cron/readme/HISTORY.rst b/queue_job_cron/readme/HISTORY.rst
@@ -0,0 +1,14 @@
+16.0.2.0.0 (2024-01-08)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+**Features**
+
+- By default prevent parallel run of the same cron job when run as queue job.
+
+  When a cron job is run by odoo, the odoo runner will prevent parallel run
+  of the same cron job. Before this change, this was not the case when the
+  cron job was run as a queue job. A new option is added to the cron job when
+  run as a queue job to prevent parallel run. This option is set to True by
+  default. In this way, the behavior is now the same as when the cron job is run
+  by odoo but you keep the possibility to disable this restriction when run as
+  a queue job. (`#612 <https://github.com/OCA/queue/issues/612>`_)
diff --git a/queue_job_cron/readme/newsfragments/612.feature b/queue_job_cron/readme/newsfragments/612.feature
diff --git a/queue_job_cron/static/description/index.html b/queue_job_cron/static/description/index.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -367,7 +366,7 @@ <h1 class="title">Scheduled Actions as Queue Jobs</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:b480c9654ed31009970555755c9376fdcaa5746eeeb0fc9415ec99d387ce5605
+!! source digest: sha256:1b958952dc577556fc8f6149cb6652b2d8c1aba382da774f0f67740833889ac4
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/queue/tree/16.0/queue_job_cron"><img alt="OCA/queue" src="https://img.shields.io/badge/github-OCA%2Fqueue-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/queue-16-0/queue-16-0-queue_job_cron"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/queue&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module extends the functionality of queue_job and allows to run an Odoo
@@ -377,11 +376,15 @@ <h1 class="title">Scheduled Actions as Queue Jobs</h1>
 <ul class="simple">
 <li><a class="reference internal" href="#installation" id="toc-entry-1">Installation</a></li>
 <li><a class="reference internal" href="#usage" id="toc-entry-2">Usage</a></li>
-<li><a class="reference internal" href="#bug-tracker" id="toc-entry-3">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="toc-entry-4">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="toc-entry-5">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="toc-entry-6">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="toc-entry-7">Maintainers</a></li>
+<li><a class="reference internal" href="#changelog" id="toc-entry-3">Changelog</a><ul>
+<li><a class="reference internal" href="#section-1" id="toc-entry-4">16.0.2.0.0 (2024-01-08)</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-5">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-6">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-7">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-8">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-9">Maintainers</a></li>
 </ul>
 </li>
 </ul>
@@ -403,30 +406,48 @@ <h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
 <p>Channels can be used to manage sequential jobs and prevent concurrency accesses.
 To do that you just have to define a channel per cron limited to 1 at time.</p>
 </div>
+<div class="section" id="changelog">
+<h1><a class="toc-backref" href="#toc-entry-3">Changelog</a></h1>
+<div class="section" id="section-1">
+<h2><a class="toc-backref" href="#toc-entry-4">16.0.2.0.0 (2024-01-08)</a></h2>
+<p><strong>Features</strong></p>
+<ul>
+<li><p class="first">By default prevent parallel run of the same cron job when run as queue job.</p>
+<p>When a cron job is run by odoo, the odoo runner will prevent parallel run
+of the same cron job. Before this change, this was not the case when the
+cron job was run as a queue job. A new option is added to the cron job when
+run as a queue job to prevent parallel run. This option is set to True by
+default. In this way, the behavior is now the same as when the cron job is run
+by odoo but you keep the possibility to disable this restriction when run as
+a queue job. (<a class="reference external" href="https://github.com/OCA/queue/issues/612">#612</a>)</p>
+</li>
+</ul>
+</div>
+</div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-5">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/queue/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
 <a class="reference external" href="https://github.com/OCA/queue/issues/new?body=module:%20queue_job_cron%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#toc-entry-4">Credits</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-6">Credits</a></h1>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-7">Authors</a></h2>
 <ul class="simple">
 <li>ACSONE SA/NV</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-8">Contributors</a></h2>
 <ul class="simple">
 <li>Cédric Pigeon &lt;<a class="reference external" href="mailto:cedric.pigeon&#64;acsone.eu">cedric.pigeon&#64;acsone.eu</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-9">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose