diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b9173cd1dd31fdf97e39af0fc061588ea3de2dc0_LmdpdGxhYi1jaS55bWw=..3fc7fdae17c96ee689fffc3443ce9c1daa2c8bdb_LmdpdGxhYi1jaS55bWw= 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,6 @@ include: - project: xcg/ci-templates file: /odoo/15.0/gitlab-ci.yaml + +variables: + CI_TEMPLATE_NO_INSTALL_MODULE: "" diff --git a/README.rst b/README.rst index b9173cd1dd31fdf97e39af0fc061588ea3de2dc0_UkVBRE1FLnJzdA==..3fc7fdae17c96ee689fffc3443ce9c1daa2c8bdb_UkVBRE1FLnJzdA== 100644 --- a/README.rst +++ b/README.rst @@ -2,15 +2,6 @@ External Job ============ -.. |pipeline| image:: https://orus.io/xcg/odoo-modules/external_job/badges/branch/15.0/pipeline.svg - :target: https://orus.io/xcg/odoo-modules/external_job/-/pipelines?ref=branch/15.0 - :alt: pipeline status -.. |coverage| image:: .badges/coverage.svg - :target: https://orus.io/xcg/templates/odoo_module/-/pipelines?ref=branch/15.0 - :alt: Coverage report -.. |pylint| image:: .badges/pylint.svg - :target: https://orus.io/xcg/odoo-modules/external_job/-/pipelines?ref=branch/15.0 - :alt: pylint score .. |maturity| image:: .badges/maturity.svg :target: https://odoo-community.org/page/development-status :alt: Stable @@ -24,7 +15,7 @@ :target: https://github.com/prettier/prettier :alt: Prettier -|pipeline| |coverage| |pylint| |maturity| |license| |black| |prettier| +|maturity| |license| |black| |prettier| This is a module for Odoo to run external programs. diff --git a/__manifest__.py b/__manifest__.py index b9173cd1dd31fdf97e39af0fc061588ea3de2dc0_X19tYW5pZmVzdF9fLnB5..3fc7fdae17c96ee689fffc3443ce9c1daa2c8bdb_X19tYW5pZmVzdF9fLnB5 100644 --- a/__manifest__.py +++ b/__manifest__.py @@ -1,7 +1,7 @@ ############################################################################## # # External Jobs, for Odoo -# Copyright (C) 2013, 2019, 2020, 2022, 2023 XCG Consulting +# Copyright © 2013, 2019, 2020, 2022, 2023 XCG Consulting # (https://xcg-consulting.fr) # # This program is free software: you can redistribute it and/or modify diff --git a/doc/autotodo.py b/doc/autotodo.py index b9173cd1dd31fdf97e39af0fc061588ea3de2dc0_ZG9jL2F1dG90b2RvLnB5..3fc7fdae17c96ee689fffc3443ce9c1daa2c8bdb_ZG9jL2F1dG90b2RvLnB5 100755 --- a/doc/autotodo.py +++ b/doc/autotodo.py @@ -2,7 +2,7 @@ ############################################################################## # # OpenERP, Open Source Management Solution -# Copyright (C) 2014, 2018, 2022, 2023 XCG Consulting +# Copyright © 2014, 2018, 2022, 2023 XCG Consulting # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/doc/conf.py b/doc/conf.py index b9173cd1dd31fdf97e39af0fc061588ea3de2dc0_ZG9jL2NvbmYucHk=..3fc7fdae17c96ee689fffc3443ce9c1daa2c8bdb_ZG9jL2NvbmYucHk= 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -36,7 +36,7 @@ "sphinx.ext.todo", "sphinx.ext.coverage", "sphinx.ext.viewcode", - "sphinxodoo.ext.autodoc", + "sphinxodooautodoc.ext.autodoc", ] # Add any paths that contain templates here, relative to this directory. @@ -147,7 +147,5 @@ intersphinx_mapping = {"https://docs.python.org/3/": None} -# -# odoo-sphinx-autodoc -# +# -- Options for sphinx-odoo-autodoc extension ---------------------------- @@ -153,5 +151,6 @@ -# sphinxodoo_addons : List of addons name to load (if empty, no addon will be loaded) +# sphinxodooautodoc_addons : List of addons name to load (if empty, no addon will be +# loaded) this_module = os.path.basename( os.path.dirname(os.path.dirname(os.path.abspath(__file__))) ) @@ -155,10 +154,12 @@ this_module = os.path.basename( os.path.dirname(os.path.dirname(os.path.abspath(__file__))) ) -sphinxodoo_addons = [this_module] -# sphinxodoo_root_path : Path of the Odoo root directory -sphinxodoo_root_path = os.path.dirname(os.path.dirname(os.path.abspath(odoo.__file__))) -# sphinxodoo_addons_path : List of paths were Odoo addons to load are located +sphinxodooautodoc_addons = [this_module] +# sphinxodooautodoc_root_path : Path of the Odoo root directory +sphinxodooautodoc_root_path = os.path.dirname( + os.path.dirname(os.path.abspath(odoo.__file__)) +) +# sphinxodooautodoc_addons_path : List of paths were Odoo addons to load are located c = None # find setup file of superproject, if any directory = os.path.dirname(os.getenv("PWD")) @@ -169,7 +170,7 @@ c.read(setup_path) if c.has_section("odoo_scripts"): # reload with odoo_scripts - c = Configuration(os.path.dirname(setup_path)) + c = Configuration(directory) else: c = None if not c: @@ -178,9 +179,9 @@ else: directory = None -sphinxodoo_addons_path = list() +sphinxodooautodoc_addons_path = [] if c: addon_dirs = set(os.path.dirname(path) for path in c.modules) for line in addon_dirs: @@ -182,8 +183,8 @@ if c: addon_dirs = set(os.path.dirname(path) for path in c.modules) for line in addon_dirs: - sphinxodoo_addons_path.append(os.path.join(directory, line)) + sphinxodooautodoc_addons_path.append(os.path.join(directory, line)) else: # add this directory top dir @@ -188,6 +189,8 @@ else: # add this directory top dir - sphinxodoo_addons_path.append(os.path.dirname(os.path.dirname(os.getenv("PWD")))) + sphinxodooautodoc_addons_path.append( + os.path.dirname(os.path.dirname(os.getenv("PWD"))) + ) other_addons = os.getenv("ODOO_ADDONS_PATH", default=None) if other_addons: for addon_path in other_addons.split(","): @@ -191,4 +194,4 @@ other_addons = os.getenv("ODOO_ADDONS_PATH", default=None) if other_addons: for addon_path in other_addons.split(","): - sphinxodoo_addons_path.append(addon_path) + sphinxodooautodoc_addons_path.append(addon_path) diff --git a/doc/index.rst b/doc/index.rst index b9173cd1dd31fdf97e39af0fc061588ea3de2dc0_ZG9jL2luZGV4LnJzdA==..3fc7fdae17c96ee689fffc3443ce9c1daa2c8bdb_ZG9jL2luZGV4LnJzdA== 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -1,3 +1,12 @@ +.. |coverage| image:: .badges/coverage.svg + :target: https://orus.io/xcg/odoo-modules/external_job/-/pipelines?ref=branch/15.0 + :alt: Coverage report +.. |pylint| image:: .badges/pylint.svg + :target: https://orus.io/xcg/odoo-modules/external_job/-/pipelines?ref=branch/15.0 + :alt: pylint score + +|coverage| |pylint| + .. include:: README.rst Contents: @@ -15,4 +24,3 @@ * :ref:`genindex` * :ref:`modindex` * :ref:`search` - diff --git a/models/__init__.py b/models/__init__.py index b9173cd1dd31fdf97e39af0fc061588ea3de2dc0_bW9kZWxzL19faW5pdF9fLnB5..3fc7fdae17c96ee689fffc3443ce9c1daa2c8bdb_bW9kZWxzL19faW5pdF9fLnB5 100644 --- a/models/__init__.py +++ b/models/__init__.py @@ -1,4 +1,4 @@ -from . import ( # noqa: F401 +from . import ( default_value, env_var, extrunner_server, diff --git a/models/default_value.py b/models/default_value.py index b9173cd1dd31fdf97e39af0fc061588ea3de2dc0_bW9kZWxzL2RlZmF1bHRfdmFsdWUucHk=..3fc7fdae17c96ee689fffc3443ce9c1daa2c8bdb_bW9kZWxzL2RlZmF1bHRfdmFsdWUucHk= 100644 --- a/models/default_value.py +++ b/models/default_value.py @@ -1,7 +1,7 @@ ############################################################################### # # External Jobs, for Odoo -# Copyright (C) 2019, 2022 XCG Consulting (http://www.xcg-consulting.fr/) +# Copyright © 2019, 2022 XCG Consulting (http://www.xcg-consulting.fr/) # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/models/env_var.py b/models/env_var.py index b9173cd1dd31fdf97e39af0fc061588ea3de2dc0_bW9kZWxzL2Vudl92YXIucHk=..3fc7fdae17c96ee689fffc3443ce9c1daa2c8bdb_bW9kZWxzL2Vudl92YXIucHk= 100644 --- a/models/env_var.py +++ b/models/env_var.py @@ -1,7 +1,7 @@ ############################################################################## # # External Jobs, for Odoo -# Copyright (C) 2013, 2022 XCG Consulting (http://odoo.consulting) +# Copyright © 2013, 2022 XCG Consulting (http://odoo.consulting) # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/models/extrunner_server.py b/models/extrunner_server.py index b9173cd1dd31fdf97e39af0fc061588ea3de2dc0_bW9kZWxzL2V4dHJ1bm5lcl9zZXJ2ZXIucHk=..3fc7fdae17c96ee689fffc3443ce9c1daa2c8bdb_bW9kZWxzL2V4dHJ1bm5lcl9zZXJ2ZXIucHk= 100644 --- a/models/extrunner_server.py +++ b/models/extrunner_server.py @@ -1,7 +1,7 @@ ############################################################################## # # External Jobs, for Odoo -# Copyright (C) 2019, 2023 XCG Consulting (https://xcg-consulting.fr/) +# Copyright © 2019, 2023 XCG Consulting (https://xcg-consulting.fr/) # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/models/job_definition.py b/models/job_definition.py index b9173cd1dd31fdf97e39af0fc061588ea3de2dc0_bW9kZWxzL2pvYl9kZWZpbml0aW9uLnB5..3fc7fdae17c96ee689fffc3443ce9c1daa2c8bdb_bW9kZWxzL2pvYl9kZWZpbml0aW9uLnB5 100644 --- a/models/job_definition.py +++ b/models/job_definition.py @@ -1,7 +1,7 @@ ############################################################################### # # External Jobs, for Odoo -# Copyright (C) 2018, 2019, 2022, 2023 XCG Consulting +# Copyright © 2018, 2019, 2022, 2023 XCG Consulting # (https://www.xcg-consulting.fr/) # # This program is free software: you can redistribute it and/or modify diff --git a/models/job_log.py b/models/job_log.py index b9173cd1dd31fdf97e39af0fc061588ea3de2dc0_bW9kZWxzL2pvYl9sb2cucHk=..3fc7fdae17c96ee689fffc3443ce9c1daa2c8bdb_bW9kZWxzL2pvYl9sb2cucHk= 100644 --- a/models/job_log.py +++ b/models/job_log.py @@ -1,7 +1,7 @@ ############################################################################### # # External Jobs, for Odoo -# Copyright (C) 2014-2016, 2022, 2023 XCG Consulting (https://www.xcg-consulting.fr/) +# Copyright © 2014-2016, 2022, 2023 XCG Consulting (https://www.xcg-consulting.fr/) # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/pyproject.toml b/pyproject.toml index b9173cd1dd31fdf97e39af0fc061588ea3de2dc0_cHlwcm9qZWN0LnRvbWw=..3fc7fdae17c96ee689fffc3443ce9c1daa2c8bdb_cHlwcm9qZWN0LnRvbWw= 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,8 +16,8 @@ dependencies = ["odoo~=15.0", "sh"] [project.optional-dependencies] -doc = ["sphinx", "sphinx-odoo-autodoc >=0.3.3", "sphinx-intl"] -tests = ["freezegun"] +doc = ["sphinx", "sphinx-odoo-autodoc"] +test = ["freezegun"] [project.urls] repository = "https://orus.io/xcg/odoo-modules/external_job" @@ -35,6 +35,9 @@ [tool.setuptools_scm] +[tool.black] +target = 3.10 + [tool.isort] py_version = 310 profile = "black" @@ -49,6 +52,3 @@ 'FIRSTPARTY', 'LOCALFOLDER' ] - -[tool.black] -target = 3.10 diff --git a/tests/__init__.py b/tests/__init__.py index b9173cd1dd31fdf97e39af0fc061588ea3de2dc0_dGVzdHMvX19pbml0X18ucHk=..3fc7fdae17c96ee689fffc3443ce9c1daa2c8bdb_dGVzdHMvX19pbml0X18ucHk= 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,1 +1,1 @@ -from . import test_job_definition, test_job_log, test_jobrunner # noqa: F401 +from . import test_job_definition, test_job_log, test_jobrunner diff --git a/tests/test_job_definition.py b/tests/test_job_definition.py index b9173cd1dd31fdf97e39af0fc061588ea3de2dc0_dGVzdHMvdGVzdF9qb2JfZGVmaW5pdGlvbi5weQ==..3fc7fdae17c96ee689fffc3443ce9c1daa2c8bdb_dGVzdHMvdGVzdF9qb2JfZGVmaW5pdGlvbi5weQ== 100644 --- a/tests/test_job_definition.py +++ b/tests/test_job_definition.py @@ -1,7 +1,7 @@ ############################################################################### # # External Job, for Odoo -# Copyright (C) 2018, 2022, 2023 XCG Consulting (https://www.xcg-consulting.fr/) +# Copyright © 2018, 2022, 2023 XCG Consulting (https://www.xcg-consulting.fr/) # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/tests/test_job_log.py b/tests/test_job_log.py index b9173cd1dd31fdf97e39af0fc061588ea3de2dc0_dGVzdHMvdGVzdF9qb2JfbG9nLnB5..3fc7fdae17c96ee689fffc3443ce9c1daa2c8bdb_dGVzdHMvdGVzdF9qb2JfbG9nLnB5 100644 --- a/tests/test_job_log.py +++ b/tests/test_job_log.py @@ -1,7 +1,7 @@ ############################################################################### # # External Jobs, for Odoo -# Copyright (C) 2022, 2023 XCG Consulting (https://www.xcg-consulting.fr/) +# Copyright © 2022, 2023 XCG Consulting (https://www.xcg-consulting.fr/) # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/tests/test_jobrunner.py b/tests/test_jobrunner.py index b9173cd1dd31fdf97e39af0fc061588ea3de2dc0_dGVzdHMvdGVzdF9qb2JydW5uZXIucHk=..3fc7fdae17c96ee689fffc3443ce9c1daa2c8bdb_dGVzdHMvdGVzdF9qb2JydW5uZXIucHk= 100644 --- a/tests/test_jobrunner.py +++ b/tests/test_jobrunner.py @@ -1,7 +1,7 @@ ############################################################################### # # External Jobs, for Odoo -# Copyright (C) 2022 XCG Consulting (https://www.xcg-consulting.fr/) +# Copyright © 2022 XCG Consulting (https://www.xcg-consulting.fr/) # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/wizards/__init__.py b/wizards/__init__.py index b9173cd1dd31fdf97e39af0fc061588ea3de2dc0_d2l6YXJkcy9fX2luaXRfXy5weQ==..3fc7fdae17c96ee689fffc3443ce9c1daa2c8bdb_d2l6YXJkcy9fX2luaXRfXy5weQ== 100644 --- a/wizards/__init__.py +++ b/wizards/__init__.py @@ -1,3 +1,1 @@ -# flake8: noqa - from . import jobrunner diff --git a/wizards/jobrunner.py b/wizards/jobrunner.py index b9173cd1dd31fdf97e39af0fc061588ea3de2dc0_d2l6YXJkcy9qb2JydW5uZXIucHk=..3fc7fdae17c96ee689fffc3443ce9c1daa2c8bdb_d2l6YXJkcy9qb2JydW5uZXIucHk= 100644 --- a/wizards/jobrunner.py +++ b/wizards/jobrunner.py @@ -1,7 +1,7 @@ ############################################################################### # # External Job, for Odoo -# Copyright (C) 2022 XCG Consulting (https://www.xcg-consulting.fr/) +# Copyright © 2022 XCG Consulting (https://www.xcg-consulting.fr/) # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as