From 5e79f1641cd8942643f1f582cdfe6f2c9bf8bedb Mon Sep 17 00:00:00 2001 From: oca-git-bot Date: Fri, 27 Oct 2023 20:20:00 +0200 Subject: [PATCH 1/2] [IMP] update dotfiles --- .copier-answers.yml | 8 ++------ .eslintrc.yml | 1 + .github/workflows/pre-commit.yml | 13 ++++++++++++- .pre-commit-config.yaml | 16 +++++++++++++++- 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 707bd9ecb..054c51364 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,16 +1,12 @@ # Do NOT update manually; changes here will be overwritten by Copier -_commit: v1.14.2 +_commit: v1.17.2 _src_path: gh:oca/oca-addons-repo-template ci: Travis dependency_installation_mode: PIP generate_requirements_txt: true -github_check_license: true -github_ci_extra_env: {} -github_enable_codecov: true -github_enable_makepot: true github_enable_stale_action: true -github_enforce_dev_status_compatibility: true include_wkhtmltopdf: false +odoo_test_flavor: Both odoo_version: 14.0 org_name: Odoo Community Association (OCA) org_slug: OCA diff --git a/.eslintrc.yml b/.eslintrc.yml index 9429bc688..fed88d70d 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -22,6 +22,7 @@ globals: odoo: readonly openerp: readonly owl: readonly + luxon: readonly # Styling is handled by Prettier, so we only need to enable AST rules; # see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890 diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 755f8a225..602ecbca2 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -13,8 +13,10 @@ jobs: pre-commit: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-python@v2 + with: + python-version: "3.11" - name: Get python version run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV - uses: actions/cache@v1 @@ -25,6 +27,15 @@ jobs: run: pip install pre-commit - name: Run pre-commit run: pre-commit run --all-files --show-diff-on-failure --color=always + env: + # Consider valid a PR that changes README fragments but doesn't + # change the README.rst file itself. It's not really a problem + # because the bot will update it anyway after merge. This way, we + # lower the barrier for functional contributors that want to fix the + # readme fragments, while still letting developers get README + # auto-generated (which also helps functionals when using runboat). + # DOCS https://pre-commit.com/#temporarily-disabling-hooks + SKIP: oca-gen-addon-readme - name: Check that all files generated by pre-commit are in git run: | newfiles="$(git ls-files --others --exclude-from=.gitignore)" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 176b5e4d9..732115031 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,6 +12,8 @@ exclude: | /static/(src/)?lib/| # Repos using Sphinx to generate docs don't need prettying ^docs/_templates/.*\.html$| + # Don't bother non-technical authors with formatting issues in docs + readme/.*\.(rst|md)$| # You don't usually want a bot to modify your legal texts (LICENSE.*|COPYING.*) default_language_version: @@ -33,12 +35,24 @@ repos: language: fail files: '[a-zA-Z0-9_]*/i18n/en\.po$' - repo: https://github.com/oca/maintainer-tools - rev: ab1d7f6 + rev: 969238e47c07d0c40573acff81d170f63245d738 hooks: # update the NOT INSTALLABLE ADDONS section above - id: oca-update-pre-commit-excluded-addons - id: oca-fix-manifest-website args: ["https://github.com/OCA/l10n-switzerland"] + - id: oca-gen-addon-readme + args: + - --addons-dir=. + - --branch=14.0 + - --org-name=OCA + - --repo-name=l10n-switzerland + - --if-source-changed + - repo: https://github.com/OCA/odoo-pre-commit-hooks + rev: v0.0.25 + hooks: + - id: oca-checks-odoo-module + - id: oca-checks-po - repo: https://github.com/myint/autoflake rev: v1.4 hooks: From fab1a3236a7dc16a20737f0c569d78d143a621b0 Mon Sep 17 00:00:00 2001 From: Thierry Ducrest Date: Mon, 30 Oct 2023 08:41:25 +0100 Subject: [PATCH 2/2] [IMP] linting manual fix --- ebill_paynet/data/mail_activity_type.xml | 18 ++-- l10n_ch_base_bank/views/bank.xml | 110 +++++++++++------------ 2 files changed, 62 insertions(+), 66 deletions(-) diff --git a/ebill_paynet/data/mail_activity_type.xml b/ebill_paynet/data/mail_activity_type.xml index 7b4b82da5..af61978b2 100644 --- a/ebill_paynet/data/mail_activity_type.xml +++ b/ebill_paynet/data/mail_activity_type.xml @@ -1,12 +1,10 @@ - - - - Paynet System Error - fa-warning - 0 - 99 - warning - - + + + Paynet System Error + fa-warning + 0 + 99 + warning + diff --git a/l10n_ch_base_bank/views/bank.xml b/l10n_ch_base_bank/views/bank.xml index 1272f4930..5b44bb181 100644 --- a/l10n_ch_base_bank/views/bank.xml +++ b/l10n_ch_base_bank/views/bank.xml @@ -1,61 +1,59 @@ - - - res.bank.search - res.bank - - - - - - - - + + res.bank.search + res.bank + + + + + + + + + + + + + add custom fields on bank + res.bank + + + + + - - - - add custom fields on bank - res.bank - - - - - - - - - - - {'required': [('country_code', '=', 'CH')]} - - - {'required': [('country_code', '=', 'CH')]} - + + + + + {'required': [('country_code', '=', 'CH')]} + + + {'required': [('country_code', '=', 'CH')]} + + + + + add custom fields on bank list + res.bank + + + + + + + - - - add custom fields on bank list - res.bank - - - - - - - - - - - + +