From e63b48f51608fbb2d5c7c8ec45cdc3d3cae585ec Mon Sep 17 00:00:00 2001 From: oca-git-bot Date: Fri, 27 Oct 2023 22:35:10 +0200 Subject: [PATCH 1/5] [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 337384cad..824af3bd7 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: server-backend repo_slug: server-backend repo_website: https://github.com/OCA/server-backend -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 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/.github/workflows/test.yml b/.github/workflows/test.yml index 215b84b0f..326c12556 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 b97bb20c9..5135c4650 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/server-backend"] + - id: oca-gen-addon-readme + args: + - --addons-dir=. + - --branch=14.0 + - --org-name=OCA + - --repo-name=server-backend + - --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 6b30938f22bb74991d6f3c13511ef0130c214125 Mon Sep 17 00:00:00 2001 From: Enric Tobella Date: Sat, 28 Oct 2023 14:57:37 +0200 Subject: [PATCH 2/5] *: Pylint --- base_external_dbsource/views/base_external_dbsource.xml | 4 ++-- base_global_discount/views/global_discount_views.xml | 4 ++-- base_import_match/views/base_import_match_view.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/base_external_dbsource/views/base_external_dbsource.xml b/base_external_dbsource/views/base_external_dbsource.xml index aaa7d2e8e..9b6c8e5a9 100644 --- a/base_external_dbsource/views/base_external_dbsource.xml +++ b/base_external_dbsource/views/base_external_dbsource.xml @@ -6,7 +6,7 @@ base.external.dbsource tree - + @@ -17,7 +17,7 @@ base.external.dbsource.form base.external.dbsource -
+ diff --git a/base_global_discount/views/global_discount_views.xml b/base_global_discount/views/global_discount_views.xml index fd22e9257..77e11e40e 100644 --- a/base_global_discount/views/global_discount_views.xml +++ b/base_global_discount/views/global_discount_views.xml @@ -5,7 +5,7 @@ global.discount - + @@ -17,7 +17,7 @@ global.discount - + diff --git a/base_import_match/views/base_import_match_view.xml b/base_import_match/views/base_import_match_view.xml index e32abcf3a..87ce73e0e 100644 --- a/base_import_match/views/base_import_match_view.xml +++ b/base_import_match/views/base_import_match_view.xml @@ -44,7 +44,7 @@ Import match tree view base_import.match - + From efb0b7519f73d4e5e76f20cdb4c63c92e1a63d2e Mon Sep 17 00:00:00 2001 From: oca-ci Date: Sat, 28 Oct 2023 13:00:04 +0000 Subject: [PATCH 3/5] [UPD] Update base_external_dbsource.pot --- base_external_dbsource/i18n/base_external_dbsource.pot | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/base_external_dbsource/i18n/base_external_dbsource.pot b/base_external_dbsource/i18n/base_external_dbsource.pot index cea7c29a1..3c558938c 100644 --- a/base_external_dbsource/i18n/base_external_dbsource.pot +++ b/base_external_dbsource/i18n/base_external_dbsource.pot @@ -116,16 +116,6 @@ msgstr "" msgid "Display Name" msgstr "" -#. module: base_external_dbsource -#: model_terms:ir.ui.view,arch_db:base_external_dbsource.view_dbsource_form -msgid "External DB Source" -msgstr "" - -#. module: base_external_dbsource -#: model_terms:ir.ui.view,arch_db:base_external_dbsource.view_dbsource_tree -msgid "External DB Sources" -msgstr "" - #. module: base_external_dbsource #: model:ir.actions.act_window,name:base_external_dbsource.action_dbsource #: model:ir.model,name:base_external_dbsource.model_base_external_dbsource From b85e3be49c2d791d0d1fa5538ddc810c9a01c0bb Mon Sep 17 00:00:00 2001 From: oca-ci Date: Sat, 28 Oct 2023 13:00:05 +0000 Subject: [PATCH 4/5] [UPD] Update base_global_discount.pot --- base_global_discount/i18n/base_global_discount.pot | 2 -- 1 file changed, 2 deletions(-) diff --git a/base_global_discount/i18n/base_global_discount.pot b/base_global_discount/i18n/base_global_discount.pot index 868b6ac35..566aa018c 100644 --- a/base_global_discount/i18n/base_global_discount.pot +++ b/base_global_discount/i18n/base_global_discount.pot @@ -67,8 +67,6 @@ msgstr "" #. module: base_global_discount #: model:ir.actions.act_window,name:base_global_discount.action_global_discount_tree #: model:ir.ui.menu,name:base_global_discount.menu_global_discount -#: model_terms:ir.ui.view,arch_db:base_global_discount.global_discount_view_form -#: model_terms:ir.ui.view,arch_db:base_global_discount.global_discount_view_tree msgid "Global Discounts" msgstr "" From b95ff82a299a456efbfb32b834f6218812d335e9 Mon Sep 17 00:00:00 2001 From: oca-ci Date: Sat, 28 Oct 2023 13:00:06 +0000 Subject: [PATCH 5/5] [UPD] Update base_import_match.pot --- base_import_match/i18n/base_import_match.pot | 1 - 1 file changed, 1 deletion(-) diff --git a/base_import_match/i18n/base_import_match.pot b/base_import_match/i18n/base_import_match.pot index 9283a9318..36962d726 100644 --- a/base_import_match/i18n/base_import_match.pot +++ b/base_import_match/i18n/base_import_match.pot @@ -106,7 +106,6 @@ msgstr "" #: model:ir.ui.menu,name:base_import_match.match_menu #: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view #: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view -#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view msgid "Import Match" msgstr ""