From 3c125a93483dfb47fba29965fa1e2afc7a3297f1 Mon Sep 17 00:00:00 2001 From: oca-git-bot Date: Fri, 27 Oct 2023 21:57:29 +0200 Subject: [PATCH 1/2] [IMP] update dotfiles --- .copier-answers.yml | 6 ++---- .eslintrc.yml | 1 + .github/workflows/pre-commit.yml | 16 ++++++++++++++++ .github/workflows/test.yml | 8 ++++---- .pre-commit-config.yaml | 16 +++++++++++++++- 5 files changed, 38 insertions(+), 9 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index d3e0b35e5..ecf535e0b 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 @@ -22,6 +22,4 @@ repo_description: "This project aims to deal with modules related to the webclie repo_name: Web addons for Odoo repo_slug: web repo_website: https://github.com/OCA/web -travis_apt_packages: [] -travis_apt_sources: [] 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 5cdd68ed3..9d085e5aa 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -13,10 +13,17 @@ jobs: pre-commit: runs-on: ubuntu-22.04 steps: +<<<<<<< before updating - uses: actions/checkout@v2 - uses: actions/setup-python@v4 with: python-version: "3.10" +======= + - uses: actions/checkout@v3 + - uses: actions/setup-python@v2 + with: + python-version: "3.11" +>>>>>>> after updating - name: Get python version run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV - uses: actions/cache@v1 @@ -27,6 +34,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 d301a5668..caf148810 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 @@ -37,18 +37,18 @@ jobs: include: - container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest include: "web_widget_model_viewer" - makepot: "true" name: test with Odoo - container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest include: "web_widget_model_viewer" name: test with OCB + makepot: "true" - container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest exclude: "web_widget_model_viewer" - makepot: "true" name: test with Odoo - container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest exclude: "web_widget_model_viewer" name: test with OCB + makepot: "true" services: postgres: image: postgres:9.6 @@ -62,7 +62,7 @@ jobs: INCLUDE: "${{ matrix.include }}" EXCLUDE: "${{ matrix.exclude }}" 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 988051bfe..8e2098eaf 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/web"] + - id: oca-gen-addon-readme + args: + - --addons-dir=. + - --branch=14.0 + - --org-name=OCA + - --repo-name=web + - --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 ee19af1587ce02b83292b2861e66b96a7c57548b Mon Sep 17 00:00:00 2001 From: Alessandro Uffreduzzi Date: Mon, 30 Oct 2023 17:01:22 +0100 Subject: [PATCH 2/2] [FIX] all: fix pre-commit new checks --- .github/workflows/pre-commit.yml | 7 - .github/workflows/stale.yml.rej | 9 -- .../demo/ir_config_parameter_data.xml | 42 +++--- web_create_write_confirm/views/assets.xml | 18 ++- .../views/popup_message.xml | 134 +++++++++--------- .../views/views.xml | 6 +- web_m2x_options_manager/views/ir_model.xml | 2 +- web_no_bubble/views/web_no_bubble.xml | 50 ++++--- .../views/res_config_settings_views.xml | 121 ++++++++-------- web_switch_context_warning/view/view.xml | 30 ++-- 10 files changed, 194 insertions(+), 225 deletions(-) delete mode 100644 .github/workflows/stale.yml.rej diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 9d085e5aa..602ecbca2 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -13,17 +13,10 @@ jobs: pre-commit: runs-on: ubuntu-22.04 steps: -<<<<<<< before updating - - uses: actions/checkout@v2 - - uses: actions/setup-python@v4 - with: - python-version: "3.10" -======= - uses: actions/checkout@v3 - uses: actions/setup-python@v2 with: python-version: "3.11" ->>>>>>> after updating - name: Get python version run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV - uses: actions/cache@v1 diff --git a/.github/workflows/stale.yml.rej b/.github/workflows/stale.yml.rej deleted file mode 100644 index f41569091..000000000 --- a/.github/workflows/stale.yml.rej +++ /dev/null @@ -1,9 +0,0 @@ -diff a/.github/workflows/stale.yml b/.github/workflows/stale.yml (rejected hunks) -@@ -15,2 +15,3 @@ jobs: - # General settings. -+ ascending: true - remove-stale-when-updated: true -@@ -52,2 +53,3 @@ jobs: - repo-token: ${{ secrets.GITHUB_TOKEN }} -+ ascending: true - only-labels: "needs more information" diff --git a/support_branding/demo/ir_config_parameter_data.xml b/support_branding/demo/ir_config_parameter_data.xml index ef9bf9417..4ec7d4b06 100644 --- a/support_branding/demo/ir_config_parameter_data.xml +++ b/support_branding/demo/ir_config_parameter_data.xml @@ -1,25 +1,23 @@ - - - support_company - Odoo Community Association - - - support_company_url - https://odoo-community.org - - - support_branding_color - #fff - - - support_email - oca@example.com - - - support_release - 14.0 - - + + support_company + Odoo Community Association + + + support_company_url + https://odoo-community.org + + + support_branding_color + #fff + + + support_email + oca@example.com + + + support_release + 14.0 + diff --git a/web_create_write_confirm/views/assets.xml b/web_create_write_confirm/views/assets.xml index 6aec517eb..57605f94a 100644 --- a/web_create_write_confirm/views/assets.xml +++ b/web_create_write_confirm/views/assets.xml @@ -1,15 +1,13 @@ - -