From 2eda28d82f3f4eb4d51ca5adc14388a76958fe84 Mon Sep 17 00:00:00 2001 From: Benoit Aimont Date: Wed, 31 Aug 2022 14:24:43 +0200 Subject: [PATCH 1/4] [IMP] queue_job: black, isort, prettier --- .pre-commit-config.yaml | 1 - setup/queue_job/odoo/addons/queue_job | 1 + setup/queue_job/setup.py | 6 ++++++ 3 files changed, 7 insertions(+), 1 deletion(-) create mode 120000 setup/queue_job/odoo/addons/queue_job create mode 100644 setup/queue_job/setup.py diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d84a7d7f59..e91efca4f2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,7 +3,6 @@ exclude: | # NOT INSTALLABLE ADDONS ^base_export_async/| ^base_import_async/| - ^queue_job/| ^queue_job_cron/| ^queue_job_cron_jobrunner/| ^queue_job_subscribe/| diff --git a/setup/queue_job/odoo/addons/queue_job b/setup/queue_job/odoo/addons/queue_job new file mode 120000 index 0000000000..ac796aaa1c --- /dev/null +++ b/setup/queue_job/odoo/addons/queue_job @@ -0,0 +1 @@ +../../../../queue_job \ No newline at end of file diff --git a/setup/queue_job/setup.py b/setup/queue_job/setup.py new file mode 100644 index 0000000000..28c57bb640 --- /dev/null +++ b/setup/queue_job/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From ed9f63313912a305ce78bebe60d3851484268949 Mon Sep 17 00:00:00 2001 From: Benoit Aimont Date: Wed, 31 Aug 2022 14:44:29 +0200 Subject: [PATCH 2/4] [MIG] queue_job: Migration to 16.0 --- queue_job/README.rst | 14 +++++++------- queue_job/__manifest__.py | 4 ++-- queue_job/controllers/main.py | 2 +- queue_job/i18n/queue_job.pot | 2 +- queue_job/static/description/index.html | 6 +++--- queue_job/tests/test_model_job_channel.py | 6 +++--- requirements.txt | 1 + 7 files changed, 18 insertions(+), 17 deletions(-) diff --git a/queue_job/README.rst b/queue_job/README.rst index 898a4736dc..1fba4a8fd1 100644 --- a/queue_job/README.rst +++ b/queue_job/README.rst @@ -14,16 +14,16 @@ Job Queue :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html :alt: License: LGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fqueue-lightgray.png?logo=github - :target: https://github.com/OCA/queue/tree/15.0/queue_job + :target: https://github.com/OCA/queue/tree/16.0/queue_job :alt: OCA/queue .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/queue-15-0/queue-15-0-queue_job + :target: https://translation.odoo-community.org/projects/queue-16-0/queue-16-0-queue_job :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/230/15.0 + :target: https://runbot.odoo-community.org/runbot/230/16.0 :alt: Try me on Runbot -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| This addon adds an integrated Job Queue to Odoo. @@ -330,7 +330,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -377,8 +377,8 @@ promote its widespread use. Current `maintainer `__: -|maintainer-guewen| +|maintainer-guewen| -This module is part of the `OCA/queue `_ project on GitHub. +This module is part of the `OCA/queue `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/queue_job/__manifest__.py b/queue_job/__manifest__.py index e2cf33953e..458c0a0d28 100644 --- a/queue_job/__manifest__.py +++ b/queue_job/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Job Queue", - "version": "15.0.1.0.2", + "version": "16.0.1.0.0", "author": "Camptocamp,ACSONE SA/NV,Odoo Community Association (OCA)", "website": "https://github.com/OCA/queue", "license": "LGPL-3", @@ -22,7 +22,7 @@ "data/queue_data.xml", "data/queue_job_function_data.xml", ], - "installable": False, + "installable": True, "development_status": "Mature", "maintainers": ["guewen"], "post_init_hook": "post_init_hook", diff --git a/queue_job/controllers/main.py b/queue_job/controllers/main.py index a68897e7f4..d877254bfe 100644 --- a/queue_job/controllers/main.py +++ b/queue_job/controllers/main.py @@ -31,7 +31,7 @@ def _try_perform_job(self, env, job): job.perform() job.set_done() job.store() - env["base"].flush() + env.flush_all() env.cr.commit() _logger.debug("%s done", job) diff --git a/queue_job/i18n/queue_job.pot b/queue_job/i18n/queue_job.pot index 82f8714311..3f233f6a27 100644 --- a/queue_job/i18n/queue_job.pot +++ b/queue_job/i18n/queue_job.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 15.0\n" +"Project-Id-Version: Odoo Server 16.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" diff --git a/queue_job/static/description/index.html b/queue_job/static/description/index.html index 9b4521dc11..e3595b6ba6 100644 --- a/queue_job/static/description/index.html +++ b/queue_job/static/description/index.html @@ -367,7 +367,7 @@

Job Queue

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Mature License: LGPL-3 OCA/queue Translate me on Weblate Try me on Runbot

+

Mature License: LGPL-3 OCA/queue Translate me on Weblate Try me on Runbot

This addon adds an integrated Job Queue to Odoo.

It allows to postpone method calls executed asynchronously.

Jobs are executed in the background by a Jobrunner, in their own transaction.

@@ -651,7 +651,7 @@

Bug Tracker

Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -feedback.

+feedback.

Do not contact contributors directly about support or help with technical issues.

@@ -688,7 +688,7 @@

Maintainers

promote its widespread use.

Current maintainer:

guewen

-

This module is part of the OCA/queue project on GitHub.

+

This module is part of the OCA/queue project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

diff --git a/queue_job/tests/test_model_job_channel.py b/queue_job/tests/test_model_job_channel.py index bf04ec17aa..95d9cd5ec8 100644 --- a/queue_job/tests/test_model_job_channel.py +++ b/queue_job/tests/test_model_job_channel.py @@ -43,10 +43,10 @@ def test_channel_complete_name_uniq(self): # It is normally called on commit. # The context manager 'with self.assertRaises(IntegrityError)' purposefully - # not uses here due to its 'flush()' method inside it and exception raises - # before the line 'self.env["base"].flush()'. So, we are expecting an IntegrityError. + # not uses here due to its 'flush_all()' method inside it and exception raises + # before the line 'self.env.flush_all()'. So, we are expecting an IntegrityError. try: - self.env["base"].flush() + self.env.flush_all() except IntegrityError as ex: self.assertIn("queue_job_channel_name_uniq", ex.pgerror) else: diff --git a/requirements.txt b/requirements.txt index 9cd1629223..b4d39fb9e0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,2 @@ # generated from manifests external_dependencies +requests From 7fc91495302ef506c2cd138c1cd2d966a2c2f314 Mon Sep 17 00:00:00 2001 From: Benoit Aimont Date: Tue, 11 Oct 2022 11:10:08 +0200 Subject: [PATCH 3/4] [MIG] test_queue_job: Migration to 16.0 --- .pre-commit-config.yaml | 1 - setup/test_queue_job/odoo/addons/test_queue_job | 1 + setup/test_queue_job/setup.py | 6 ++++++ test_queue_job/__manifest__.py | 4 ++-- test_queue_job/i18n/test_queue_job.pot | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) create mode 120000 setup/test_queue_job/odoo/addons/test_queue_job create mode 100644 setup/test_queue_job/setup.py diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e91efca4f2..1f6940c575 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,7 +7,6 @@ exclude: | ^queue_job_cron_jobrunner/| ^queue_job_subscribe/| ^test_base_import_async/| - ^test_queue_job/| # END NOT INSTALLABLE ADDONS # Files and folders generated by bots, to avoid loops ^setup/|/static/description/index\.html$| diff --git a/setup/test_queue_job/odoo/addons/test_queue_job b/setup/test_queue_job/odoo/addons/test_queue_job new file mode 120000 index 0000000000..0473d5583c --- /dev/null +++ b/setup/test_queue_job/odoo/addons/test_queue_job @@ -0,0 +1 @@ +../../../../test_queue_job \ No newline at end of file diff --git a/setup/test_queue_job/setup.py b/setup/test_queue_job/setup.py new file mode 100644 index 0000000000..28c57bb640 --- /dev/null +++ b/setup/test_queue_job/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/test_queue_job/__manifest__.py b/test_queue_job/__manifest__.py index e740a9690b..b1b55c494e 100644 --- a/test_queue_job/__manifest__.py +++ b/test_queue_job/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Queue Job Tests", - "version": "15.0.1.0.0", + "version": "16.0.1.0.0", "author": "Camptocamp,Odoo Community Association (OCA)", "license": "LGPL-3", "category": "Generic Modules", @@ -14,5 +14,5 @@ "data/queue_job_function_data.xml", "security/ir.model.access.csv", ], - "installable": False, + "installable": True, } diff --git a/test_queue_job/i18n/test_queue_job.pot b/test_queue_job/i18n/test_queue_job.pot index 6d8b5b3813..506932ccd9 100644 --- a/test_queue_job/i18n/test_queue_job.pot +++ b/test_queue_job/i18n/test_queue_job.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 15.0\n" +"Project-Id-Version: Odoo Server 16.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" From 6caca1aa057bc38706af3f92c33ee51c5c6c2c7f Mon Sep 17 00:00:00 2001 From: Benoit Aimont Date: Tue, 11 Oct 2022 11:39:43 +0200 Subject: [PATCH 4/4] [FIX] import mock from unittest --- queue_job/tests/common.py | 3 +-- test_queue_job/tests/test_job.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/queue_job/tests/common.py b/queue_job/tests/common.py index dcb948e764..f4ecbbf6ce 100644 --- a/queue_job/tests/common.py +++ b/queue_job/tests/common.py @@ -4,8 +4,7 @@ import logging import sys from contextlib import contextmanager - -import mock +from unittest import mock from ..job import Job diff --git a/test_queue_job/tests/test_job.py b/test_queue_job/tests/test_job.py index 4414e870d5..ad9d2b37f5 100644 --- a/test_queue_job/tests/test_job.py +++ b/test_queue_job/tests/test_job.py @@ -3,8 +3,7 @@ import hashlib from datetime import datetime, timedelta - -import mock +from unittest import mock import odoo.tests.common as common from odoo import SUPERUSER_ID