From 3d2104a77cb719260377223fd5a9fec6768c570e Mon Sep 17 00:00:00 2001 From: SilvioC2C <silvio.gregorini@camptocamp.com> Date: Thu, 11 Jul 2024 12:10:05 +0200 Subject: [PATCH] [IMP] connector_jira_tempo: pre-commit auto-fixes --- connector_jira_tempo/README.rst | 34 +++++++++---------- .../models/account_analytic_line/common.py | 4 +-- .../models/jira_backend/common.py | 2 +- connector_jira_tempo/pyproject.toml | 3 ++ connector_jira_tempo/readme/CONTRIBUTORS.md | 14 ++++++++ connector_jira_tempo/readme/CONTRIBUTORS.rst | 14 -------- .../{DESCRIPTION.rst => DESCRIPTION.md} | 0 .../static/description/index.html | 18 +++++----- .../tests/test_import_tempo.py | 1 - 9 files changed, 46 insertions(+), 44 deletions(-) create mode 100644 connector_jira_tempo/pyproject.toml create mode 100644 connector_jira_tempo/readme/CONTRIBUTORS.md delete mode 100644 connector_jira_tempo/readme/CONTRIBUTORS.rst rename connector_jira_tempo/readme/{DESCRIPTION.rst => DESCRIPTION.md} (100%) diff --git a/connector_jira_tempo/README.rst b/connector_jira_tempo/README.rst index 403facb09..6b5182871 100644 --- a/connector_jira_tempo/README.rst +++ b/connector_jira_tempo/README.rst @@ -17,13 +17,13 @@ JIRA Connector Tempo :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fconnector--jira-lightgray.png?logo=github - :target: https://github.com/OCA/connector-jira/tree/15.0/connector_jira_tempo + :target: https://github.com/OCA/connector-jira/tree/17.0/connector_jira_tempo :alt: OCA/connector-jira .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/connector-jira-15-0/connector-jira-15-0-connector_jira_tempo + :target: https://translation.odoo-community.org/projects/connector-jira-17-0/connector-jira-17-0-connector_jira_tempo :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png - :target: https://runboat.odoo-community.org/builds?repo=OCA/connector-jira&target_branch=15.0 + :target: https://runboat.odoo-community.org/builds?repo=OCA/connector-jira&target_branch=17.0 :alt: Try me on Runboat |badge1| |badge2| |badge3| |badge4| |badge5| @@ -41,7 +41,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues <https://github.com/OCA/connector-jira/issues>`_. 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 -`feedback <https://github.com/OCA/connector-jira/issues/new?body=module:%20connector_jira_tempo%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_. +`feedback <https://github.com/OCA/connector-jira/issues/new?body=module:%20connector_jira_tempo%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_. Do not contact contributors directly about support or help with technical issues. @@ -49,30 +49,30 @@ Credits ======= Authors -~~~~~~~ +------- * Camptocamp Contributors -~~~~~~~~~~~~ +------------ -* `Camptocamp <https://www.camptocamp.com>`_: +- `Camptocamp <https://www.camptocamp.com>`__: - * Simone Orsi <simahawk@gmail.com> - * Guewen Baconnier <guewen.baconnier@camptocamp.com> - * Akim Juillerat <akim.juillerat@camptocamp.com> - * Denis Leemann <denis.leemann@camptocamp.com> + - Simone Orsi <simahawk@gmail.com> + - Guewen Baconnier <guewen.baconnier@camptocamp.com> + - Akim Juillerat <akim.juillerat@camptocamp.com> + - Denis Leemann <denis.leemann@camptocamp.com> -* `CorporateHub <https://corporatehub.eu/>`__ +- `CorporateHub <https://corporatehub.eu/>`__ - * Alexey Pelykh <alexey.pelykh@corphub.eu> + - Alexey Pelykh <alexey.pelykh@corphub.eu> -* `Trobz <https://trobz.com>`_: +- `Trobz <https://trobz.com>`__: - * Son Ho <sonhd@trobz.com> + - Son Ho <sonhd@trobz.com> Maintainers -~~~~~~~~~~~ +----------- This module is maintained by the OCA. @@ -84,6 +84,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/connector-jira <https://github.com/OCA/connector-jira/tree/15.0/connector_jira_tempo>`_ project on GitHub. +This module is part of the `OCA/connector-jira <https://github.com/OCA/connector-jira/tree/17.0/connector_jira_tempo>`_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/connector_jira_tempo/models/account_analytic_line/common.py b/connector_jira_tempo/models/account_analytic_line/common.py index 54de36a4f..b3c17dda2 100644 --- a/connector_jira_tempo/models/account_analytic_line/common.py +++ b/connector_jira_tempo/models/account_analytic_line/common.py @@ -51,9 +51,7 @@ def tempo_timesheets_approval_read(self, worklog): ) return json.loads(response) - def tempo_timesheets_approval_read_status_by_team( - self, team_id, period_start - ): # noqa + def tempo_timesheets_approval_read_status_by_team(self, team_id, period_start): # noqa backend = self._tempo_timesheets_get_webservice() response = backend.call( "get", diff --git a/connector_jira_tempo/models/jira_backend/common.py b/connector_jira_tempo/models/jira_backend/common.py index 745306589..53fd37ea8 100644 --- a/connector_jira_tempo/models/jira_backend/common.py +++ b/connector_jira_tempo/models/jira_backend/common.py @@ -74,7 +74,7 @@ def _sync_tempo_timesheets_approval_status(self, period_start): try: user = user_binder.to_internal(user_data["accountId"], unwrap=True) except ValueError: - _logger.error("User %(key)s not found" % user_data) + _logger.error("User %s not found", user_data) continue status = result["status"]["key"].lower() mapping[(date_from, date_to, status)].append(user.id) diff --git a/connector_jira_tempo/pyproject.toml b/connector_jira_tempo/pyproject.toml new file mode 100644 index 000000000..4231d0ccc --- /dev/null +++ b/connector_jira_tempo/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["whool"] +build-backend = "whool.buildapi" diff --git a/connector_jira_tempo/readme/CONTRIBUTORS.md b/connector_jira_tempo/readme/CONTRIBUTORS.md new file mode 100644 index 000000000..1b199ee2f --- /dev/null +++ b/connector_jira_tempo/readme/CONTRIBUTORS.md @@ -0,0 +1,14 @@ +- [Camptocamp](https://www.camptocamp.com): + + > - Simone Orsi \<<simahawk@gmail.com>\> + > - Guewen Baconnier \<<guewen.baconnier@camptocamp.com>\> + > - Akim Juillerat \<<akim.juillerat@camptocamp.com>\> + > - Denis Leemann \<<denis.leemann@camptocamp.com>\> + +- [CorporateHub](https://corporatehub.eu/) + + - Alexey Pelykh \<<alexey.pelykh@corphub.eu>\> + +- [Trobz](https://trobz.com): + + > - Son Ho \<<sonhd@trobz.com>\> diff --git a/connector_jira_tempo/readme/CONTRIBUTORS.rst b/connector_jira_tempo/readme/CONTRIBUTORS.rst deleted file mode 100644 index 5c9dedae5..000000000 --- a/connector_jira_tempo/readme/CONTRIBUTORS.rst +++ /dev/null @@ -1,14 +0,0 @@ -* `Camptocamp <https://www.camptocamp.com>`_: - - * Simone Orsi <simahawk@gmail.com> - * Guewen Baconnier <guewen.baconnier@camptocamp.com> - * Akim Juillerat <akim.juillerat@camptocamp.com> - * Denis Leemann <denis.leemann@camptocamp.com> - -* `CorporateHub <https://corporatehub.eu/>`__ - - * Alexey Pelykh <alexey.pelykh@corphub.eu> - -* `Trobz <https://trobz.com>`_: - - * Son Ho <sonhd@trobz.com> diff --git a/connector_jira_tempo/readme/DESCRIPTION.rst b/connector_jira_tempo/readme/DESCRIPTION.md similarity index 100% rename from connector_jira_tempo/readme/DESCRIPTION.rst rename to connector_jira_tempo/readme/DESCRIPTION.md diff --git a/connector_jira_tempo/static/description/index.html b/connector_jira_tempo/static/description/index.html index e78ce6bc1..48fe40ed2 100644 --- a/connector_jira_tempo/static/description/index.html +++ b/connector_jira_tempo/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> @@ -9,10 +8,11 @@ /* :Author: David Goodger (goodger@python.org) -:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $ +:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $ :Copyright: This stylesheet has been placed in the public domain. Default cascading style sheet for the HTML output of Docutils. +Despite the name, some widely supported CSS2 features are used. See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to customize this style sheet. @@ -275,7 +275,7 @@ margin-left: 2em ; margin-right: 2em } -pre.code .ln { color: grey; } /* line numbers */ +pre.code .ln { color: gray; } /* line numbers */ pre.code, code { background-color: #eeeeee } pre.code .comment, code .comment { color: #5C6576 } pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold } @@ -301,7 +301,7 @@ span.pre { white-space: pre } -span.problematic { +span.problematic, pre.problematic { color: red } span.section-subtitle { @@ -369,7 +369,7 @@ <h1 class="title">JIRA Connector Tempo</h1> !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! source digest: sha256:f50e6d1a785293b7646d47d84fa2e1f3323b44769f5e48c537a622ea652ef3e5 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -<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/connector-jira/tree/15.0/connector_jira_tempo"><img alt="OCA/connector-jira" src="https://img.shields.io/badge/github-OCA%2Fconnector--jira-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/connector-jira-15-0/connector-jira-15-0-connector_jira_tempo"><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/connector-jira&target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p> +<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/connector-jira/tree/17.0/connector_jira_tempo"><img alt="OCA/connector-jira" src="https://img.shields.io/badge/github-OCA%2Fconnector--jira-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/connector-jira-17-0/connector-jira-17-0-connector_jira_tempo"><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/connector-jira&target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p> <p>This module adds Jira Tempo synchronization feature.</p> <p><strong>Table of contents</strong></p> <div class="contents local topic" id="contents"> @@ -388,7 +388,7 @@ <h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1> <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/connector-jira/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/connector-jira/issues/new?body=module:%20connector_jira_tempo%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p> +<a class="reference external" href="https://github.com/OCA/connector-jira/issues/new?body=module:%20connector_jira_tempo%0Aversion:%2017.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"> @@ -429,11 +429,13 @@ <h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2> <div class="section" id="maintainers"> <h2><a class="toc-backref" href="#toc-entry-5">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> +<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 mission is to support the collaborative development of Odoo features and promote its widespread use.</p> -<p>This module is part of the <a class="reference external" href="https://github.com/OCA/connector-jira/tree/15.0/connector_jira_tempo">OCA/connector-jira</a> project on GitHub.</p> +<p>This module is part of the <a class="reference external" href="https://github.com/OCA/connector-jira/tree/17.0/connector_jira_tempo">OCA/connector-jira</a> project on GitHub.</p> <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p> </div> </div> diff --git a/connector_jira_tempo/tests/test_import_tempo.py b/connector_jira_tempo/tests/test_import_tempo.py index db2595c0f..c6c0f1069 100644 --- a/connector_jira_tempo/tests/test_import_tempo.py +++ b/connector_jira_tempo/tests/test_import_tempo.py @@ -14,7 +14,6 @@ class TestImportWorklogStatus(TestImportWorklogBase): - # Warning: if you add new tests or change the cassettes # you might need to change these values # to make issue types match