From 34d14936176b0e6dc72e7bf861c53035509a29cc Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Tue, 21 Nov 2023 21:24:24 +0100 Subject: [PATCH 1/2] [REF] Update copier update (2023-11-21) --- .copier-answers.yml | 6 ++---- .eslintrc.yml | 1 + .github/workflows/pre-commit.yml | 13 ++++++++++++- .github/workflows/test.yml | 4 ++-- .gitignore | 5 +++++ .pre-commit-config.yaml | 14 ++++++++++++-- 6 files changed, 34 insertions(+), 9 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index cdf77f8a..36fd4d93 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: 7de0cb5 +_commit: a7bd24b _src_path: https://github.com/grap/oca-addons-repo-template-new.git ci: GitHub -dependency_installation_mode: PIP generate_requirements_txt: true github_check_license: true github_ci_extra_env: {} @@ -12,6 +11,7 @@ github_enable_stale_action: false github_enforce_dev_status_compatibility: false include_wkhtmltopdf: false odoo_real_version: 12.0 +odoo_test_flavor: Odoo odoo_version: 16.0 org_name: GRAP org_slug: grap @@ -22,6 +22,4 @@ repo_name: Incubator of Odoo (formely OpenERP) modules before they are shared to OCA repo_slug: grap-odoo-incubator repo_website: https://github.com/grap/grap-odoo-incubator -travis_apt_packages: [] -travis_apt_sources: [] diff --git a/.eslintrc.yml b/.eslintrc.yml index cee2fdaf..1a35ecbc 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 0d7e59c0..611d3367 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 d6e33a2a..cb0356f6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,8 +19,8 @@ jobs: matrix: include: - container: ghcr.io/oca/oca-ci/py3.6-odoo12.0:latest - makepot: "false" name: test with Odoo + makepot: "false" services: postgres: image: postgres:9.6 @@ -31,7 +31,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/.gitignore b/.gitignore index 9c283fd4..d2082f56 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,8 @@ +# +# Do not share pdf file. (grap-odoo-business-supplier-invoice) +*.pdf +# + # Byte-compiled / optimized / DLL files __pycache__/ *.py[cod] diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 34d1eb95..c6a5d08b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,6 +3,8 @@ exclude: | (?x) # NOT INSTALLABLE ADDONS # END NOT INSTALLABLE ADDONS + # Do no touch encrypted files + .*\.encrypted| # Files and folders generated by bots, to avoid loops ^setup/|/static/description/index\.html$| # We don't want to mess with tool-generated files @@ -13,6 +15,10 @@ 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)$| + # Ignore build and dist directories in addons + /build/|/dist/| # You don't usually want a bot to modify your legal texts (LICENSE.*|COPYING.*) default_language_version: @@ -34,13 +40,17 @@ 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/grap/grap-odoo-incubator"] - + - 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 011fbe69d5b7676519ab811fd103b8c6687dbdad Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Tue, 21 Nov 2023 21:25:34 +0100 Subject: [PATCH 2/2] [REF] new rule --- stock_internal_use_of_products/data/ir_sequence.xml | 6 ++---- stock_internal_use_of_products/views/view_internal_use.xml | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/stock_internal_use_of_products/data/ir_sequence.xml b/stock_internal_use_of_products/data/ir_sequence.xml index ebcffa12..8ebd531c 100644 --- a/stock_internal_use_of_products/data/ir_sequence.xml +++ b/stock_internal_use_of_products/data/ir_sequence.xml @@ -5,8 +5,7 @@ Copyright (C) 2019 - Today: GRAP (http://www.grap.coop) @author: Quentin DUPONT (quentin.dupont@grap.coop) License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). --> - - + Internal Use internal.use @@ -14,5 +13,4 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). 5 - - + diff --git a/stock_internal_use_of_products/views/view_internal_use.xml b/stock_internal_use_of_products/views/view_internal_use.xml index 3791c576..ea5cc5a6 100644 --- a/stock_internal_use_of_products/views/view_internal_use.xml +++ b/stock_internal_use_of_products/views/view_internal_use.xml @@ -85,7 +85,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - +