From 6890e6b65e3c86a2cae95ab164c9231d1c95d24f Mon Sep 17 00:00:00 2001 From: oca-git-bot Date: Wed, 1 May 2024 16:34:43 +0000 Subject: [PATCH 1/2] [IMP] update dotfiles --- .copier-answers.yml | 3 ++- .github/workflows/stale.yml | 4 ++-- .github/workflows/test.yml | 4 +++- .pre-commit-config.yaml | 5 ++++- .ruff.toml | 1 + 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 0e5090df8df..ad442bd2c1f 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,8 +1,9 @@ # Do NOT update manually; changes here will be overwritten by Copier -_commit: v1.17.2-11-g69f3b9a +_commit: v1.21.1 _src_path: gh:oca/oca-addons-repo-template additional_ruff_rules: [] ci: GitHub +convert_readme_fragments_to_markdown: false generate_requirements_txt: true github_check_license: true github_ci_extra_env: {} diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 1693a1253bd..fa17fcd4e85 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Stale PRs and issues policy - uses: actions/stale@v4 + uses: actions/stale@v9 with: repo-token: ${{ secrets.GITHUB_TOKEN }} # General settings. @@ -48,7 +48,7 @@ jobs: # * Issues that are pending more information # * Except Issues marked as "no stale" - name: Needs more information stale issues policy - uses: actions/stale@v4 + uses: actions/stale@v9 with: repo-token: ${{ secrets.GITHUB_TOKEN }} ascending: true diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e1af7438faf..3bf18e843c5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -63,7 +63,9 @@ jobs: run: oca_init_test_database - name: Run tests run: oca_run_tests - - uses: codecov/codecov-action@v1 + - uses: codecov/codecov-action@v4 + with: + token: ${{ secrets.CODECOV_TOKEN }} - name: Update .pot files run: oca_export_and_push_pot https://x-access-token:${{ secrets.GIT_PUSH_TOKEN }}@github.com/${{ github.repository }} if: ${{ matrix.makepot == 'true' && github.event_name == 'push' && github.repository_owner == 'OCA' }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1ae4b1394fa..9cc2e367c6d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -16,6 +16,8 @@ exclude: | readme/.*\.(rst|md)$| # Ignore build and dist directories in addons /build/|/dist/| + # Ignore test files in addons + /tests/samples/.*| # You don't usually want a bot to modify your legal texts (LICENSE.*|COPYING.*) default_language_version: @@ -37,7 +39,7 @@ repos: language: fail files: '[a-zA-Z0-9_]*/i18n/en\.po$' - repo: https://github.com/oca/maintainer-tools - rev: 568cacd1d6eef453063a524a5ce63dcd49c7259b + rev: 9a170331575a265c092ee6b24b845ec508e8ef75 hooks: # update the NOT INSTALLABLE ADDONS section above - id: oca-update-pre-commit-excluded-addons @@ -50,6 +52,7 @@ repos: - --org-name=OCA - --repo-name=knowledge - --if-source-changed + - --keep-source-digest - repo: https://github.com/OCA/odoo-pre-commit-hooks rev: v0.0.25 hooks: diff --git a/.ruff.toml b/.ruff.toml index 634db8e79b4..0240c75f6a4 100644 --- a/.ruff.toml +++ b/.ruff.toml @@ -6,6 +6,7 @@ fix = true extend-select = [ "B", "C90", + "E501", # line too long (default 88) "I", # isort "UP", # pyupgrade ] From 2d2559941323dd6227c9cef8e091d1e0a6fafaf4 Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Thu, 4 Jul 2024 13:12:46 +0200 Subject: [PATCH 2/2] [FIX] linting after update dotfiles --- .../models/ir_attachment_action_download.py | 3 ++- document_url/static/src/js/url.esm.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/attachment_zipped_download/models/ir_attachment_action_download.py b/attachment_zipped_download/models/ir_attachment_action_download.py index 6e84206d1c0..e06c573ebfb 100644 --- a/attachment_zipped_download/models/ir_attachment_action_download.py +++ b/attachment_zipped_download/models/ir_attachment_action_download.py @@ -27,7 +27,8 @@ def action_download_attachments(self): """Return action to: * emit a warning message if no attachment found * download a file if only 1 file found - * zip and download the list of attachment returns by `_get_downloadable_attachments` + * zip and download the list of attachment returns by + `_get_downloadable_attachments` """ attachments = self._get_downloadable_attachments() if not attachments: diff --git a/document_url/static/src/js/url.esm.js b/document_url/static/src/js/url.esm.js index 6d4bd8b802a..1f37f8e998a 100644 --- a/document_url/static/src/js/url.esm.js +++ b/document_url/static/src/js/url.esm.js @@ -1,8 +1,8 @@ /** @odoo-module **/ -import {registerPatch} from "@mail/model/model_core"; import {AttachmentCard} from "@mail/components/attachment_card/attachment_card"; import {patch} from "web.utils"; +import {registerPatch} from "@mail/model/model_core"; import {url} from "@web/core/utils/urls"; registerPatch({