From 9f489407df85921757e139263555d8d086f561af Mon Sep 17 00:00:00 2001 From: oca-git-bot Date: Fri, 27 Oct 2023 21:24:35 +0200 Subject: [PATCH 1/3] [IMP] update dotfiles --- .copier-answers.yml | 6 ++---- .eslintrc.yml | 1 + .github/workflows/pre-commit.yml | 13 ++++++++++++- .github/workflows/test.yml | 6 +++--- .pre-commit-config.yaml | 16 +++++++++++++++- 5 files changed, 33 insertions(+), 9 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 6b3ce2a0..af462a5d 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,8 +1,7 @@ # 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: GitHub -dependency_installation_mode: PIP generate_requirements_txt: true github_check_license: true github_ci_extra_env: {} @@ -11,6 +10,7 @@ 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 @@ -19,6 +19,4 @@ repo_description: 'TODO: add repo description.' repo_name: rma repo_slug: rma repo_website: https://github.com/OCA/rma -travis_apt_packages: [] -travis_apt_sources: [] diff --git a/.eslintrc.yml b/.eslintrc.yml index 9429bc68..fed88d70 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 755f8a22..602ecbca 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/.github/workflows/test.yml b/.github/workflows/test.yml index 215b84b0..326c1255 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@v2 + - uses: actions/checkout@v3 - run: | for reqfile in requirements.txt test-requirements.txt ; do if [ -f ${reqfile} ] ; then @@ -36,10 +36,10 @@ jobs: matrix: include: - container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest - makepot: "true" name: test with Odoo - container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest name: test with OCB + makepot: "true" services: postgres: image: postgres:9.6 @@ -50,7 +50,7 @@ jobs: ports: - 5432:5432 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: persist-credentials: false - name: Install addons and dependencies diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 82d6ca8e..98a97b26 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/rma"] + - id: oca-gen-addon-readme + args: + - --addons-dir=. + - --branch=14.0 + - --org-name=OCA + - --repo-name=rma + - --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 c2ea8669240979cc1127d74e6bf9de4058b634cb Mon Sep 17 00:00:00 2001 From: oca-ci Date: Fri, 27 Oct 2023 19:37:26 +0000 Subject: [PATCH 2/3] [UPD] Update rma.pot --- rma/i18n/rma.pot | 8 -------- 1 file changed, 8 deletions(-) diff --git a/rma/i18n/rma.pot b/rma/i18n/rma.pot index 83aa4dbf..03be7cf7 100644 --- a/rma/i18n/rma.pot +++ b/rma/i18n/rma.pot @@ -878,9 +878,7 @@ msgstr "" #. module: rma #: model:ir.model.fields,help:rma.field_rma__message_has_error -#: model:ir.model.fields,help:rma.field_rma__message_has_sms_error #: model:ir.model.fields,help:rma.field_rma_team__message_has_error -#: model:ir.model.fields,help:rma.field_rma_team__message_has_sms_error msgid "If checked, some messages have a delivery error." msgstr "" @@ -1656,12 +1654,6 @@ msgstr "" msgid "Rma Count" msgstr "" -#. module: rma -#: model:ir.model.fields,field_description:rma.field_rma__message_has_sms_error -#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_sms_error -msgid "SMS Delivery error" -msgstr "" - #. module: rma #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date msgid "Scheduled Date" From 2ddc6b94e9caddf22a3bb9c3a2f88b53f13a8f97 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 6 Nov 2023 09:25:48 +0100 Subject: [PATCH 3/3] [FIX] *: Linter fixes --- product_warranty/views/product_warranty.xml | 2 +- rma/views/rma_finalization_views.xml | 2 +- rma/views/rma_tag_views.xml | 2 +- rma_sale/static/src/js/rma_portal_form.js | 1 + website_rma/data/website_data.xml | 14 ++++++-------- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/product_warranty/views/product_warranty.xml b/product_warranty/views/product_warranty.xml index 3c2db686..888bfc3b 100644 --- a/product_warranty/views/product_warranty.xml +++ b/product_warranty/views/product_warranty.xml @@ -5,7 +5,7 @@ product.return.instructions.tree return.instruction - + diff --git a/rma/views/rma_finalization_views.xml b/rma/views/rma_finalization_views.xml index ce0fb51c..abc7c20c 100644 --- a/rma/views/rma_finalization_views.xml +++ b/rma/views/rma_finalization_views.xml @@ -44,7 +44,7 @@ rma.finalization - + diff --git a/rma/views/rma_tag_views.xml b/rma/views/rma_tag_views.xml index d7166b65..d8e47b7d 100644 --- a/rma/views/rma_tag_views.xml +++ b/rma/views/rma_tag_views.xml @@ -37,7 +37,7 @@ rma.tag - + diff --git a/rma_sale/static/src/js/rma_portal_form.js b/rma_sale/static/src/js/rma_portal_form.js index 1bda0788..398219a2 100644 --- a/rma_sale/static/src/js/rma_portal_form.js +++ b/rma_sale/static/src/js/rma_portal_form.js @@ -69,6 +69,7 @@ odoo.define("rma_sale.animation", function (require) { * We should be able to submit only when an operation is selected and a * quantity entered in a row at least. * @private + * @returns {Boolean} */ _canSubmit: function () { var can_submit = false; diff --git a/website_rma/data/website_data.xml b/website_rma/data/website_data.xml index 3acb3276..1488a87c 100644 --- a/website_rma/data/website_data.xml +++ b/website_rma/data/website_data.xml @@ -2,12 +2,10 @@ - - - /requestrma-thank-you - - True - - - + + /requestrma-thank-you + + True + +