From e8a5ecf855abc78f780aa725da823cca29d43aac Mon Sep 17 00:00:00 2001 From: oca-git-bot Date: Fri, 27 Oct 2023 23:26:10 +0200 Subject: [PATCH 1/4] [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 | 18 ++++++++++++++++-- 5 files changed, 34 insertions(+), 10 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 200bd281b..6b16a8933 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: git+https://github.com/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: 15.0 org_name: Odoo Community Association (OCA) org_slug: OCA @@ -20,6 +20,4 @@ repo_description: This repository hosts additionnal parsers and import features repo_name: OCA bank statement import modules for Odoo repo_slug: bank-statement-import repo_website: https://github.com/OCA/bank-statement-import -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 64a21c3ef..745e3bbde 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 7fc809fb4..5c07e37d0 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.8-odoo15.0:latest - makepot: "true" name: test with Odoo - container: ghcr.io/oca/oca-ci/py3.8-ocb15.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 c9e4b1499..07b391c4f 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: dfba427ba03900b69e0a7f2c65890dc48921d36a + 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/bank-statement-import"] + - id: oca-gen-addon-readme + args: + - --addons-dir=. + - --branch=15.0 + - --org-name=OCA + - --repo-name=bank-statement-import + - --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: @@ -125,7 +139,7 @@ repos: name: flake8 additional_dependencies: ["flake8-bugbear==21.9.2"] - repo: https://github.com/OCA/pylint-odoo - rev: 7.0.2 + rev: 7.0.5 hooks: - id: pylint_odoo name: pylint with optional checks From 1cc6b4a78dbbc93cee9e245fe2160df8064753fb Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Sat, 28 Oct 2023 14:02:19 +0200 Subject: [PATCH 2/4] [FIX] account_statement_import_online_ponto: Linter fixes --- .../online_bank_statement_provider_ponto.py | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/account_statement_import_online_ponto/models/online_bank_statement_provider_ponto.py b/account_statement_import_online_ponto/models/online_bank_statement_provider_ponto.py index 7b642ce87..478d758eb 100644 --- a/account_statement_import_online_ponto/models/online_bank_statement_provider_ponto.py +++ b/account_statement_import_online_ponto/models/online_bank_statement_provider_ponto.py @@ -83,9 +83,7 @@ def _ponto_header(self): ) self.sudo().ponto_token_expiration = expiration_date else: - raise UserError( - _("{} \n\n {}").format(response.status_code, response.text) - ) + raise UserError(f"{response.status_code}\n\n {response.text}") return { "Accept": "application/json", "Authorization": "Bearer %s" % self.ponto_token, @@ -105,7 +103,7 @@ def _ponto_get_account_ids(self): ) res[iban] = account.get("id") return res - raise UserError(_("{} \n\n {}").format(response.status_code, response.text)) + raise UserError(f"{response.status_code}\n\n {response.text}") def _ponto_synchronisation(self, account_id): url = PONTO_ENDPOINT + "/synchronizations" @@ -125,9 +123,11 @@ def _ponto_synchronisation(self, account_id): sync_id = data.get("attributes", {}).get("resourceId", False) else: raise UserError( - _("Error during Create Synchronisation {} \n\n {}").format( - response.status_code, response.text - ) + _("Error during Create Synchronization %(code)s \n\n %(text)s") + % { + "code": response.status_code, + "text": response.text, + } ) # Check synchronisation @@ -161,9 +161,11 @@ def _ponto_get_transaction(self, account_id, date_since, date_until): ) if response.status_code != 200: raise UserError( - _("Error during get transaction.\n\n{} \n\n {}").format( - response.status_code, response.text - ) + _("Error during get transaction.\n\n%(code)s\n\n%(text)s") + % { + "code": response.status_code, + "text": response.text, + } ) if params.get("before"): params.pop("before") From b587b4485465eead3f824bfb0054d0cb42f5ee05 Mon Sep 17 00:00:00 2001 From: oca-ci Date: Sat, 28 Oct 2023 12:06:04 +0000 Subject: [PATCH 3/4] [UPD] Update account_statement_import_online.pot --- .../i18n/account_statement_import_online.pot | 6 ------ 1 file changed, 6 deletions(-) diff --git a/account_statement_import_online/i18n/account_statement_import_online.pot b/account_statement_import_online/i18n/account_statement_import_online.pot index a6156bb3f..7605c6628 100644 --- a/account_statement_import_online/i18n/account_statement_import_online.pot +++ b/account_statement_import_online/i18n/account_statement_import_online.pot @@ -169,7 +169,6 @@ msgstr "" #. module: account_statement_import_online #: model:ir.model.fields,help:account_statement_import_online.field_online_bank_statement_provider__message_has_error -#: model:ir.model.fields,help:account_statement_import_online.field_online_bank_statement_provider__message_has_sms_error msgid "If checked, some messages have a delivery error." msgstr "" @@ -378,11 +377,6 @@ msgstr "" msgid "Pull Online Bank Statements" msgstr "" -#. module: account_statement_import_online -#: model:ir.model.fields,field_description:account_statement_import_online.field_online_bank_statement_provider__message_has_sms_error -msgid "SMS Delivery error" -msgstr "" - #. module: account_statement_import_online #: model:ir.model.fields,field_description:account_statement_import_online.field_online_bank_statement_provider__account_number msgid "Sanitized Account Number" From df17c140ab80a7ed841ad1021f93a8b6b37b0338 Mon Sep 17 00:00:00 2001 From: oca-ci Date: Sat, 28 Oct 2023 12:06:05 +0000 Subject: [PATCH 4/4] [UPD] Update account_statement_import_online_ponto.pot --- .../i18n/account_statement_import_online_ponto.pot | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/account_statement_import_online_ponto/i18n/account_statement_import_online_ponto.pot b/account_statement_import_online_ponto/i18n/account_statement_import_online_ponto.pot index 7efae9521..1ebe23797 100644 --- a/account_statement_import_online_ponto/i18n/account_statement_import_online_ponto.pot +++ b/account_statement_import_online_ponto/i18n/account_statement_import_online_ponto.pot @@ -17,9 +17,9 @@ msgstr "" #: code:addons/account_statement_import_online_ponto/models/online_bank_statement_provider_ponto.py:0 #, python-format msgid "" -"Error during Create Synchronisation {} \n" +"Error during Create Synchronization %(code)s \n" "\n" -" {}" +" %(text)s" msgstr "" #. module: account_statement_import_online_ponto @@ -28,9 +28,9 @@ msgstr "" msgid "" "Error during get transaction.\n" "\n" -"{} \n" +"%(code)s\n" "\n" -" {}" +"%(text)s" msgstr "" #. module: account_statement_import_online_ponto