From b7a81c87cc87899d1bc9121bbc221ca38bf01eb9 Mon Sep 17 00:00:00 2001 From: Ivan Sokolov <2234999+ivs-cetmix@users.noreply.github.com> Date: Sat, 8 Nov 2025 22:11:49 +0100 Subject: [PATCH] Revert "Merge branch 'master' into master" This reverts commit 368f7e9536481387aed6797e321a3f5e5ac080c7, reversing changes made to f70373fca6830e6536c3967ba5794311602b4bd4. --- template/module/static/description/icon.png | Bin 9655 -> 10254 bytes template/module/static/description/icon.svg | 1 + .../addon1/README.expected-acme.rst | 4 ++++ .../addon1/README.expected-oca.rst | 4 ++++ .../README.expected-acme.rst | 4 ++++ .../README.expected-oca.rst | 4 ++++ .../README.expected-acme.rst | 4 ++++ .../README.expected-oca.rst | 4 ++++ tests/test_towncrier.py | 4 +++- tools/gen_addon_readme.rst.jinja | 4 ++++ tools/oca_towncrier.py | 4 +++- tools/ocb-sync.sh | 2 +- tools/towncrier-template.md | 4 +++- 13 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 template/module/static/description/icon.svg diff --git a/template/module/static/description/icon.png b/template/module/static/description/icon.png index 3963e676c9d5985c484b71ea0a19be5b3f23838e..1dcc49c24f364e9adf0afbc6fc0bac6dbecdeb11 100644 GIT binary patch literal 10254 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 aB|{|`CRX@G2jNXt07W@9**b`M=>GvQ=Lh}( diff --git a/template/module/static/description/icon.svg b/template/module/static/description/icon.svg new file mode 100644 index 000000000..ed6aaa04e --- /dev/null +++ b/template/module/static/description/icon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/tests/data/readme_tests/addon1/README.expected-acme.rst b/tests/data/readme_tests/addon1/README.expected-acme.rst index 5835ded6e..1555c4a9d 100644 --- a/tests/data/readme_tests/addon1/README.expected-acme.rst +++ b/tests/data/readme_tests/addon1/README.expected-acme.rst @@ -1,3 +1,7 @@ +.. image:: https://odoo-community.org/readme-banner-image + :target: https://odoo-community.org/get-involved?utm_source=readme + :alt: Odoo Community Association + ======= addon 1 ======= diff --git a/tests/data/readme_tests/addon1/README.expected-oca.rst b/tests/data/readme_tests/addon1/README.expected-oca.rst index 982ff1a15..c1f059e3c 100644 --- a/tests/data/readme_tests/addon1/README.expected-oca.rst +++ b/tests/data/readme_tests/addon1/README.expected-oca.rst @@ -1,3 +1,7 @@ +.. image:: https://odoo-community.org/readme-banner-image + :target: https://odoo-community.org/get-involved?utm_source=readme + :alt: Odoo Community Association + ======= addon 1 ======= diff --git a/tests/data/readme_tests/addon_one_maintainer/README.expected-acme.rst b/tests/data/readme_tests/addon_one_maintainer/README.expected-acme.rst index 40d7a6238..7d6256ec5 100644 --- a/tests/data/readme_tests/addon_one_maintainer/README.expected-acme.rst +++ b/tests/data/readme_tests/addon_one_maintainer/README.expected-acme.rst @@ -1,3 +1,7 @@ +.. image:: https://odoo-community.org/readme-banner-image + :target: https://odoo-community.org/get-involved?utm_source=readme + :alt: Odoo Community Association + ==================== addon one maintainer ==================== diff --git a/tests/data/readme_tests/addon_one_maintainer/README.expected-oca.rst b/tests/data/readme_tests/addon_one_maintainer/README.expected-oca.rst index 3f759fd11..3d7925334 100644 --- a/tests/data/readme_tests/addon_one_maintainer/README.expected-oca.rst +++ b/tests/data/readme_tests/addon_one_maintainer/README.expected-oca.rst @@ -1,3 +1,7 @@ +.. image:: https://odoo-community.org/readme-banner-image + :target: https://odoo-community.org/get-involved?utm_source=readme + :alt: Odoo Community Association + ==================== addon one maintainer ==================== diff --git a/tests/data/readme_tests/addon_two_maintainers/README.expected-acme.rst b/tests/data/readme_tests/addon_two_maintainers/README.expected-acme.rst index ae5a2dde8..ed575f5f1 100644 --- a/tests/data/readme_tests/addon_two_maintainers/README.expected-acme.rst +++ b/tests/data/readme_tests/addon_two_maintainers/README.expected-acme.rst @@ -1,3 +1,7 @@ +.. image:: https://odoo-community.org/readme-banner-image + :target: https://odoo-community.org/get-involved?utm_source=readme + :alt: Odoo Community Association + ==================== addon one maintainer ==================== diff --git a/tests/data/readme_tests/addon_two_maintainers/README.expected-oca.rst b/tests/data/readme_tests/addon_two_maintainers/README.expected-oca.rst index dc63c60c5..9747845d6 100644 --- a/tests/data/readme_tests/addon_two_maintainers/README.expected-oca.rst +++ b/tests/data/readme_tests/addon_two_maintainers/README.expected-oca.rst @@ -1,3 +1,7 @@ +.. image:: https://odoo-community.org/readme-banner-image + :target: https://odoo-community.org/get-involved?utm_source=readme + :alt: Odoo Community Association + ==================== addon one maintainer ==================== diff --git a/tests/test_towncrier.py b/tests/test_towncrier.py index 0d0b592f1..3f407a75d 100644 --- a/tests/test_towncrier.py +++ b/tests/test_towncrier.py @@ -98,6 +98,8 @@ def test_oca_towncrier_md(tmp_path): """\ ## 14.0.1.0.1 (2021-12-31) - Bugfixes: Bugfix description. (50) + ### Bugfixes + + - Bugfix description. ([#50](https://github.com/OCA/therepo/issues/50)) """ ) diff --git a/tools/gen_addon_readme.rst.jinja b/tools/gen_addon_readme.rst.jinja index 2ad375d00..59e1929e3 100644 --- a/tools/gen_addon_readme.rst.jinja +++ b/tools/gen_addon_readme.rst.jinja @@ -7,6 +7,10 @@ {% endif %} {%- endmacro -%} +.. image:: https://odoo-community.org/readme-banner-image + :target: https://odoo-community.org/get-involved?utm_source=readme + :alt: Odoo Community Association + {{ '=' * manifest.name|length }} {{ manifest.name }} {{ '=' * manifest.name|length }} diff --git a/tools/oca_towncrier.py b/tools/oca_towncrier.py index b648bb09e..00456aab1 100644 --- a/tools/oca_towncrier.py +++ b/tools/oca_towncrier.py @@ -17,7 +17,9 @@ def _make_issue_format(org, repo, fragment_format): - return "{issue}" + if fragment_format == "md": + return f"[#{{issue}}](https://github.com/{org}/{repo}/issues/{{issue}})" + return f"`#{{issue}} `_" def _get_towncrier_template(fragment_format): diff --git a/tools/ocb-sync.sh b/tools/ocb-sync.sh index c4497f8ce..951cb5698 100755 --- a/tools/ocb-sync.sh +++ b/tools/ocb-sync.sh @@ -8,7 +8,7 @@ ODOO="git@github.com:/odoo/odoo.git" OCB="git@github.com:/OCA/OCB.git" -BRANCHES="19.0 18.0 17.0 16.0 15.0 14.0" +BRANCHES="19.0 18.0 17.0 16.0 15.0" GITDIR="/var/tmp/git" PUBDIR="/var/tmp/ocb-nightly" BUILDDIR="/var/tmp/ocb-build" diff --git a/tools/towncrier-template.md b/tools/towncrier-template.md index db6cc457b..ce38e1833 100644 --- a/tools/towncrier-template.md +++ b/tools/towncrier-template.md @@ -13,9 +13,11 @@ {% if sections[section] %} {% for category, val in definitions.items() if category in sections[section] %} +### {{ definitions[category]['name'] }} + {% if definitions[category]['showcontent'] %} {% for text, values in sections[section][category].items() %} -- {{ definitions[category]['name'] }}: {{ text }} +- {{ text }} {%- if values %} {% if "\n - " in text or '\n * ' in text %}