From a90f23afddc275c4f01fc5c108accfffbe25456c Mon Sep 17 00:00:00 2001 From: David Date: Mon, 27 May 2024 15:05:06 +0200 Subject: [PATCH 1/7] [FIX] Support ecmaVersion 2022 for Odoo 17.0 Odoo officially supports ecmaVersion 2022 from v17: https://github.com/odoo/odoo/blame/9a11717c17b860ec2f1b2e228517c0d3945c474a/addons/web/tooling/_eslintrc.json#L9 --- ...=> {% if odoo_version > 12 %}.eslintrc.yml{% endif %}.jinja} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/{{% if odoo_version > 12 %}.eslintrc.yml{% endif %} => {% if odoo_version > 12 %}.eslintrc.yml{% endif %}.jinja} (98%) diff --git a/src/{% if odoo_version > 12 %}.eslintrc.yml{% endif %} b/src/{% if odoo_version > 12 %}.eslintrc.yml{% endif %}.jinja similarity index 98% rename from src/{% if odoo_version > 12 %}.eslintrc.yml{% endif %} rename to src/{% if odoo_version > 12 %}.eslintrc.yml{% endif %}.jinja index fed88d70..a06a493f 100644 --- a/src/{% if odoo_version > 12 %}.eslintrc.yml{% endif %} +++ b/src/{% if odoo_version > 12 %}.eslintrc.yml{% endif %}.jinja @@ -4,7 +4,7 @@ env: # See https://github.com/OCA/odoo-community.org/issues/37#issuecomment-470686449 parserOptions: - ecmaVersion: 2019 + ecmaVersion: {% if odoo_version < 17 %}2019{% else %}2022{% endif %} overrides: - files: From 3c189d8e823d76a1e961ccc69d48bda33e960541 Mon Sep 17 00:00:00 2001 From: Alexandre Fayolle Date: Thu, 27 Jun 2024 08:50:39 +0200 Subject: [PATCH 2/7] Add debian / redhat / macos packages to gitignore --- .gitignore | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.gitignore b/.gitignore index 0090721f..2b045db3 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,15 @@ var/ *.egg *.eggs +# Debian packages +*.deb + +# Redhat packages +*.rpm + +# MacOS packages +*.dmg + # Installer logs pip-log.txt pip-delete-this-directory.txt From a8dfa82d91c6eece729ff667ad946bccbc4a7379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sat, 6 Jul 2024 19:01:38 +0200 Subject: [PATCH 3/7] Upgrade maintainer-tools --- src/.pre-commit-config.yaml.jinja | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/.pre-commit-config.yaml.jinja b/src/.pre-commit-config.yaml.jinja index 767c8928..6a9cded5 100644 --- a/src/.pre-commit-config.yaml.jinja +++ b/src/.pre-commit-config.yaml.jinja @@ -9,7 +9,7 @@ {%- set repo_rev.flake8 = "3.8.3" %} {%- set repo_rev.flake8_bugbear = "20.1.4" %} {%- set repo_rev.isort = "5.12.0" %} - {%- set repo_rev.maintainer_tools = "9a170331575a265c092ee6b24b845ec508e8ef75" %} + {%- set repo_rev.maintainer_tools = "d5fab7ee87fceee858a3d01048c78a548974d935" %} {%- set repo_rev.nodejs = "14.13.0" %} {%- set repo_rev.odoo_pre_commit_hooks = "v0.0.25" %} {%- set repo_rev.pre_commit_hooks = "v3.2.0" %} @@ -26,7 +26,7 @@ {%- set repo_rev.flake8 = "3.9.2" %} {%- set repo_rev.flake8_bugbear = "21.9.2" %} {%- set repo_rev.isort = "5.12.0" %} - {%- set repo_rev.maintainer_tools = "9a170331575a265c092ee6b24b845ec508e8ef75" %} + {%- set repo_rev.maintainer_tools = "d5fab7ee87fceee858a3d01048c78a548974d935" %} {%- set repo_rev.nodejs = "14.18.0" %} {%- set repo_rev.odoo_pre_commit_hooks = "v0.0.25" %} {%- set repo_rev.pre_commit_hooks = "v4.0.1" %} @@ -43,7 +43,7 @@ {%- set repo_rev.flake8 = "3.9.2" %} {%- set repo_rev.flake8_bugbear = "21.9.2" %} {%- set repo_rev.isort = "5.12.0" %} - {%- set repo_rev.maintainer_tools = "9a170331575a265c092ee6b24b845ec508e8ef75" %} + {%- set repo_rev.maintainer_tools = "d5fab7ee87fceee858a3d01048c78a548974d935" %} {%- set repo_rev.nodejs = "16.17.0" %} {%- set repo_rev.odoo_pre_commit_hooks = "v0.0.25" %} {%- set repo_rev.pre_commit_hooks = "v4.3.0" %} From f8cceacfd7c6594223087f0b3d67adcedaefb8be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2024 17:26:59 +0000 Subject: [PATCH 4/7] Bump setuptools from 65.5.1 to 70.0.0 Bumps [setuptools](https://github.com/pypa/setuptools) from 65.5.1 to 70.0.0. - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst) - [Commits](https://github.com/pypa/setuptools/compare/v65.5.1...v70.0.0) --- updated-dependencies: - dependency-name: setuptools dependency-type: indirect ... Signed-off-by: dependabot[bot] --- poetry.lock | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/poetry.lock b/poetry.lock index 6616530d..fd9fd2db 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand. [[package]] name = "annotated-types" @@ -701,19 +701,18 @@ docs = ["Sphinx (>=3.3,<4.0)", "sphinx-autobuild (>=2020.9.1,<2021.0.0)", "sphin [[package]] name = "setuptools" -version = "65.5.1" +version = "70.0.0" description = "Easily download, build, install, upgrade, and uninstall Python packages" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "setuptools-65.5.1-py3-none-any.whl", hash = "sha256:d0b9a8433464d5800cbe05094acf5c6d52a91bfac9b52bcfc4d41382be5d5d31"}, - {file = "setuptools-65.5.1.tar.gz", hash = "sha256:e197a19aa8ec9722928f2206f8de752def0e4c9fc6953527360d1c36d94ddb2f"}, + {file = "setuptools-70.0.0-py3-none-any.whl", hash = "sha256:54faa7f2e8d2d11bcd2c07bed282eef1046b5c080d1c32add737d7b5817b1ad4"}, + {file = "setuptools-70.0.0.tar.gz", hash = "sha256:f211a66637b8fa059bb28183da127d4e86396c991a942b028c6650d4319c3fd0"}, ] [package.extras] -docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"] -testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8 (<5)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"] -testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"] +docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "pyproject-hooks (!=1.1)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier"] +testing = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "importlib-metadata", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "mypy (==1.9)", "packaging (>=23.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.1)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-home (>=0.5)", "pytest-mypy", "pytest-perf", "pytest-ruff (>=0.2.1)", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"] [[package]] name = "toml" From 2e9d761ecacad62a31a9c53e91a5ff9ea91b4d6a Mon Sep 17 00:00:00 2001 From: Ivan Sokolov Date: Wed, 17 Jul 2024 14:03:03 +0200 Subject: [PATCH 5/7] Update from OCA --- src/gen_addon_readme.rst.jinja | 117 +++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 src/gen_addon_readme.rst.jinja diff --git a/src/gen_addon_readme.rst.jinja b/src/gen_addon_readme.rst.jinja new file mode 100644 index 00000000..2ad375d0 --- /dev/null +++ b/src/gen_addon_readme.rst.jinja @@ -0,0 +1,117 @@ +{%- macro fragment(name, title, sub='=') %} +{%- if name in fragments %} +{{- title }} +{{ sub * title|length }} + +{{ fragments[name] }} +{% endif %} +{%- endmacro -%} + +{{ '=' * manifest.name|length }} +{{ manifest.name }} +{{ '=' * manifest.name|length }} + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: {{ source_digest }} + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +{% for (image, target, alt) in badges -%} +.. |badge{{ loop.index }}| image:: {{ image }} + :target: {{ target or '#' }} + {%- if alt %} + :alt: {{ alt }} + {%- endif %} +{% endfor %} +{% for _ in badges %}|badge{{ loop.index }}|{% if loop.index != badges|length %} {% endif %}{% endfor %} + +{{ fragments.get('DESCRIPTION', '') }} +{% if development_status == 'alpha' -%} + +.. IMPORTANT:: + This is an alpha version, the data model and design can change at any time without warning. + Only for development or testing purpose, do not use in production. + `More details on development status `_ + +{% endif -%} + +**Table of contents** + +.. contents:: + :local: + +{{ fragment('CONTEXT', 'Use Cases / Context') }} +{{- fragment('INSTALL', 'Installation') }} +{{- fragment('CONFIGURE', 'Configuration') }} +{{- fragment('USAGE', 'Usage') }} +{{- fragment('DEVELOP', 'Development') }} +{{- fragment('ROADMAP', 'Known issues / Roadmap') -}} +{{- fragment('HISTORY', 'Changelog') -}} +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 to smash it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +{% if authors -%} +Authors +{{ level3_underline * 7 }} + +{% for author in authors -%} +* {{ author }} +{% endfor %} +{% endif -%} + +{{ fragment('CONTRIBUTORS', 'Contributors', sub=level3_underline) }} +{{- fragment('CREDITS', 'Other credits', sub=level3_underline) -}} +Maintainers +{{ level3_underline * 11 }} +{%- if org_name == 'OCA' %} + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +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. +{%- endif %} + +{%- if manifest.maintainers %} +{% for maintainer in manifest.maintainers %} +.. |maintainer-{{ maintainer }}| image:: https://github.com/{{ maintainer }}.png?size=40px + :target: https://github.com/{{ maintainer }} + :alt: {{ maintainer}} +{%- endfor %} + +{% if org_name == 'OCA' -%} +Current `maintainer{% if manifest.maintainers|length > 1 %}s{% endif %} `__: +{%- else -%} +Current maintainer{% if manifest.maintainers|length > 1 %}s{% endif %}: +{%- endif %} + +{% for maintainer in manifest.maintainers %}|maintainer-{{ maintainer }}| {% endfor -%} +{% endif %} + +This module is part of the `{{ org_name }}/{{ repo_name }} `_ project on GitHub. + +{% if org_name == 'OCA' -%} +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. + +{%- else -%} +You are welcome to contribute. + +{%- endif %} + From bb9b4b640bea9684bea83540c339be16b7a56334 Mon Sep 17 00:00:00 2001 From: Ivan Sokolov Date: Mon, 22 Jul 2024 11:10:11 +0200 Subject: [PATCH 6/7] [FIX] test.yml Non resolved part remains from the previous rebase. --- .github/workflows/test.yml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7d4c425d..57dbf149 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -46,30 +46,8 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} -<<<<<<< HEAD cache: poetry -======= - - name: Python Poetry Action - uses: abatilo/actions-poetry@v2.1.0 - - name: generate cache key PY - run: - echo "PY=$((python -VV; pip freeze; poetry --version) | sha256sum | cut -d' ' - -f1)" >> $GITHUB_ENV - - uses: actions/cache@v2.1.1 - with: - path: .venv - # HACK https://github.com/actions/cache/issues/2#issuecomment-673493515 - # If you need to "clear" cache, just update the `CACHE_DATE` secret, - # putting current date (and time, if needed) - key: >- - cache ${{ secrets.CACHE_DATE }} ${{ env.PY }} ${{ runner.os }} ${{ - hashFiles('pyproject.toml') }} ${{ hashFiles('poetry.lock') }} - # HACK python-poetry/poetry#3010 and 3336 workaround for GitHub actions - # and poetry 1.1.2 throwing 'Incorrectly nested style tag found.' - - run: poetry config experimental.new-installer false - - run: poetry install ->>>>>>> bc5ada9 (Dev cetmix (#8)) # Let tests issue git commits - run: git config --global user.name CI - run: git config --global user.email CI@GITHUB From 94174bb32ec8238a8b9349fd85005dec25b27425 Mon Sep 17 00:00:00 2001 From: Ivan Sokolov Date: Mon, 29 Jul 2024 14:40:05 +0200 Subject: [PATCH 7/7] Delete gen_addon_readme as obsolete --- src/gen_addon_readme.rst.jinja | 117 --------------------------------- 1 file changed, 117 deletions(-) delete mode 100644 src/gen_addon_readme.rst.jinja diff --git a/src/gen_addon_readme.rst.jinja b/src/gen_addon_readme.rst.jinja deleted file mode 100644 index 2ad375d0..00000000 --- a/src/gen_addon_readme.rst.jinja +++ /dev/null @@ -1,117 +0,0 @@ -{%- macro fragment(name, title, sub='=') %} -{%- if name in fragments %} -{{- title }} -{{ sub * title|length }} - -{{ fragments[name] }} -{% endif %} -{%- endmacro -%} - -{{ '=' * manifest.name|length }} -{{ manifest.name }} -{{ '=' * manifest.name|length }} - -.. - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! This file is generated by oca-gen-addon-readme !! - !! changes will be overwritten. !! - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: {{ source_digest }} - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - -{% for (image, target, alt) in badges -%} -.. |badge{{ loop.index }}| image:: {{ image }} - :target: {{ target or '#' }} - {%- if alt %} - :alt: {{ alt }} - {%- endif %} -{% endfor %} -{% for _ in badges %}|badge{{ loop.index }}|{% if loop.index != badges|length %} {% endif %}{% endfor %} - -{{ fragments.get('DESCRIPTION', '') }} -{% if development_status == 'alpha' -%} - -.. IMPORTANT:: - This is an alpha version, the data model and design can change at any time without warning. - Only for development or testing purpose, do not use in production. - `More details on development status `_ - -{% endif -%} - -**Table of contents** - -.. contents:: - :local: - -{{ fragment('CONTEXT', 'Use Cases / Context') }} -{{- fragment('INSTALL', 'Installation') }} -{{- fragment('CONFIGURE', 'Configuration') }} -{{- fragment('USAGE', 'Usage') }} -{{- fragment('DEVELOP', 'Development') }} -{{- fragment('ROADMAP', 'Known issues / Roadmap') -}} -{{- fragment('HISTORY', 'Changelog') -}} -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 to smash it by providing a detailed and welcomed -`feedback `_. - -Do not contact contributors directly about support or help with technical issues. - -Credits -======= - -{% if authors -%} -Authors -{{ level3_underline * 7 }} - -{% for author in authors -%} -* {{ author }} -{% endfor %} -{% endif -%} - -{{ fragment('CONTRIBUTORS', 'Contributors', sub=level3_underline) }} -{{- fragment('CREDITS', 'Other credits', sub=level3_underline) -}} -Maintainers -{{ level3_underline * 11 }} -{%- if org_name == 'OCA' %} - -This module is maintained by the OCA. - -.. image:: https://odoo-community.org/logo.png - :alt: Odoo Community Association - :target: https://odoo-community.org - -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. -{%- endif %} - -{%- if manifest.maintainers %} -{% for maintainer in manifest.maintainers %} -.. |maintainer-{{ maintainer }}| image:: https://github.com/{{ maintainer }}.png?size=40px - :target: https://github.com/{{ maintainer }} - :alt: {{ maintainer}} -{%- endfor %} - -{% if org_name == 'OCA' -%} -Current `maintainer{% if manifest.maintainers|length > 1 %}s{% endif %} `__: -{%- else -%} -Current maintainer{% if manifest.maintainers|length > 1 %}s{% endif %}: -{%- endif %} - -{% for maintainer in manifest.maintainers %}|maintainer-{{ maintainer }}| {% endfor -%} -{% endif %} - -This module is part of the `{{ org_name }}/{{ repo_name }} `_ project on GitHub. - -{% if org_name == 'OCA' -%} -You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. - -{%- else -%} -You are welcome to contribute. - -{%- endif %} -