From bb7b9a8291f35c638d34ad73338ab543540c2118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Wed, 13 Aug 2025 11:33:35 +0200 Subject: [PATCH 1/3] Update dotfiles --- .copier-answers.yml | 3 +- .github/workflows/pre-commit.yml | 6 ++-- .github/workflows/stale.yml | 4 +-- .github/workflows/test.yml | 10 +++++-- .gitignore | 13 +++++++++ .pre-commit-config.yaml | 37 +++++++++++++++++------- .ruff.toml | 1 + checklog-odoo.cfg | 3 ++ statechart/README.rst | 6 +++- statechart/static/description/index.html | 31 ++++++++++++-------- 10 files changed, 81 insertions(+), 33 deletions(-) create mode 100644 checklog-odoo.cfg diff --git a/.copier-answers.yml b/.copier-answers.yml index 69e7570..834e178 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,9 +1,10 @@ # Do NOT update manually; changes here will be overwritten by Copier -_commit: v1.20 +_commit: v1.33 _src_path: gh:oca/oca-addons-repo-template additional_ruff_rules: [] ci: GitHub convert_readme_fragments_to_markdown: false +enable_checklog_odoo: true generate_requirements_txt: true github_check_license: true github_ci_extra_env: {} diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 38b0ba1..afd7524 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -13,13 +13,13 @@ jobs: pre-commit: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: python-version: "3.11" - name: Get python version run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV - - uses: actions/cache@v1 + - uses: actions/cache@v4 with: path: ~/.cache/pre-commit key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }} diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 1693a12..fa17fcd 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Stale PRs and issues policy - uses: actions/stale@v4 + uses: actions/stale@v9 with: repo-token: ${{ secrets.GITHUB_TOKEN }} # General settings. @@ -48,7 +48,7 @@ jobs: # * Issues that are pending more information # * Except Issues marked as "no stale" - name: Needs more information stale issues policy - uses: actions/stale@v4 + uses: actions/stale@v9 with: repo-token: ${{ secrets.GITHUB_TOKEN }} ascending: true diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9a37d2c..2fff293 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest name: Detect unreleased dependencies steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: | for reqfile in requirements.txt test-requirements.txt ; do if [ -f ${reqfile} ] ; then @@ -49,8 +49,10 @@ jobs: POSTGRES_DB: odoo ports: - 5432:5432 + env: + OCA_ENABLE_CHECKLOG_ODOO: "1" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: persist-credentials: false - name: Install addons and dependencies @@ -63,7 +65,9 @@ jobs: run: oca_init_test_database - name: Run tests run: oca_run_tests - - uses: codecov/codecov-action@v1 + - uses: codecov/codecov-action@v4 + with: + token: ${{ secrets.CODECOV_TOKEN }} - name: Update .pot files run: oca_export_and_push_pot https://x-access-token:${{ secrets.GIT_PUSH_TOKEN }}@github.com/${{ github.repository }} if: ${{ matrix.makepot == 'true' && github.event_name == 'push' && github.repository_owner == 'acsone' }} diff --git a/.gitignore b/.gitignore index 0090721..6ec07a0 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,19 @@ var/ *.egg *.eggs +# Windows installers +*.msi + +# Debian packages +*.deb + +# Redhat packages +*.rpm + +# MacOS packages +*.dmg +*.pkg + # Installer logs pip-log.txt pip-delete-this-directory.txt diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 752d762..e9d97bd 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,7 +5,7 @@ exclude: | # Files and folders generated by bots, to avoid loops ^setup/|/static/description/index\.html$| # We don't want to mess with tool-generated files - .svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/| + .svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/|^eslint.config.cjs|^prettier.config.cjs| # Maybe reactivate this when all README files include prettier ignore tags? ^README\.md$| # Library files can have extraneous formatting (even minimized) @@ -16,6 +16,8 @@ exclude: | readme/.*\.(rst|md)$| # Ignore build and dist directories in addons /build/|/dist/| + # Ignore test files in addons + /tests/samples/.*| # You don't usually want a bot to modify your legal texts (LICENSE.*|COPYING.*) default_language_version: @@ -37,11 +39,11 @@ repos: language: fail files: '[a-zA-Z0-9_]*/i18n/en\.po$' - repo: https://github.com/sbidoul/whool - rev: v0.5 + rev: v1.2 hooks: - id: whool-init - repo: https://github.com/oca/maintainer-tools - rev: 9a170331575a265c092ee6b24b845ec508e8ef75 + rev: f9b919b9868143135a9c9cb03021089cabba8223 hooks: # update the NOT INSTALLABLE ADDONS section above - id: oca-update-pre-commit-excluded-addons @@ -61,25 +63,38 @@ repos: hooks: - id: oca-checks-odoo-module - id: oca-checks-po - - repo: https://github.com/pre-commit/mirrors-prettier - rev: v2.7.1 + args: + - --disable=po-pretty-format + - repo: local hooks: - id: prettier name: prettier (with plugin-xml) + entry: prettier + args: + - --write + - --list-different + - --ignore-unknown + types: [text] + files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$ + language: node additional_dependencies: - "prettier@2.7.1" - "@prettier/plugin-xml@2.2.0" - args: - - --plugin=@prettier/plugin-xml - files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$ - - repo: https://github.com/pre-commit/mirrors-eslint - rev: v8.24.0 + - repo: local hooks: - id: eslint - verbose: true + name: eslint + entry: eslint args: - --color - --fix + verbose: true + types: [javascript] + language: node + additional_dependencies: + - "eslint@8.24.0" + - "eslint-plugin-jsdoc@" + - "globals@" - repo: https://github.com/pre-commit/pre-commit-hooks rev: v4.3.0 hooks: diff --git a/.ruff.toml b/.ruff.toml index 0240c75..8e8eccb 100644 --- a/.ruff.toml +++ b/.ruff.toml @@ -10,6 +10,7 @@ extend-select = [ "I", # isort "UP", # pyupgrade ] +extend-safe-fixes = ["UP008"] exclude = ["setup/*"] [format] diff --git a/checklog-odoo.cfg b/checklog-odoo.cfg new file mode 100644 index 0000000..0b55b7b --- /dev/null +++ b/checklog-odoo.cfg @@ -0,0 +1,3 @@ +[checklog-odoo] +ignore= + WARNING.* 0 failed, 0 error\(s\).* diff --git a/statechart/README.rst b/statechart/README.rst index f92e320..15d61cf 100644 --- a/statechart/README.rst +++ b/statechart/README.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 + ========== Statechart ========== @@ -13,7 +17,7 @@ Statechart .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status :alt: Beta -.. |badge2| image:: https://img.shields.io/badge/licence-LGPL--3-blue.png +.. |badge2| image:: https://img.shields.io/badge/license-LGPL--3-blue.png :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html :alt: License: LGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-acsone%2Fscobidoo-lightgray.png?logo=github diff --git a/statechart/static/description/index.html b/statechart/static/description/index.html index d8c952f..f68c4bb 100644 --- a/statechart/static/description/index.html +++ b/statechart/static/description/index.html @@ -3,15 +3,16 @@ -Statechart +README.rst -
-

Statechart

+
+ + +Odoo Community Association + +
+

Statechart

-

Beta License: LGPL-3 acsone/scobidoo

+

Beta License: LGPL-3 acsone/scobidoo

Add statecharts to Odoo models.

Table of contents

@@ -383,7 +389,7 @@

Statechart

-

Usage

+

Usage

There is no documentation yet. In the meantime here are the Odoo Experience 2018 slides @@ -393,7 +399,7 @@

Usage

documentation.

-

Bug Tracker

+

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 @@ -401,19 +407,20 @@

Bug Tracker

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

-

Credits

+

Credits

-

Authors

+

Authors

  • ACSONE SA/NV
-

Maintainers

+

Maintainers

This module is part of the acsone/scobidoo project on GitHub.

You are welcome to contribute.

+
From 55559694131e3d137127695fbd5b1d61cdfa940e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Wed, 13 Aug 2025 11:40:43 +0200 Subject: [PATCH 2/3] [FIX] add missing ACL in test module --- test_statechart/__manifest__.py | 1 + test_statechart/security/ir.model.access.csv | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 test_statechart/security/ir.model.access.csv diff --git a/test_statechart/__manifest__.py b/test_statechart/__manifest__.py index 1100389..ddc1d83 100644 --- a/test_statechart/__manifest__.py +++ b/test_statechart/__manifest__.py @@ -13,6 +13,7 @@ "statechart", ], "data": [ + "security/ir.model.access.csv", "views/purchase_order.xml", "security/purchase_order_delegated.xml", "security/thing_with_mailthread.xml", diff --git a/test_statechart/security/ir.model.access.csv b/test_statechart/security/ir.model.access.csv new file mode 100644 index 0000000..982bdec --- /dev/null +++ b/test_statechart/security/ir.model.access.csv @@ -0,0 +1,2 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_scobidoo_test_model,scobidoo_test_model,model_scobidoo_test_model,base.group_user,1,1,1,1 From 97af336ca7e94ee00548207720c67638643cdca7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Wed, 13 Aug 2025 11:40:59 +0200 Subject: [PATCH 3/3] Cosmetics --- test_statechart/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_statechart/__manifest__.py b/test_statechart/__manifest__.py index ddc1d83..f932927 100644 --- a/test_statechart/__manifest__.py +++ b/test_statechart/__manifest__.py @@ -13,8 +13,8 @@ "statechart", ], "data": [ - "security/ir.model.access.csv", "views/purchase_order.xml", + "security/ir.model.access.csv", "security/purchase_order_delegated.xml", "security/thing_with_mailthread.xml", ],