From 10d6e3b5c7a500f1704759e928b3bdfa2c484b01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Didderen?= Date: Sun, 28 Jan 2024 14:24:18 +0100 Subject: [PATCH] update CI config --- .copier-answers.yml | 9 ++------- .flake8 | 12 ------------ .gitignore | 3 --- .gitlab-ci.yml | 1 + .pre-commit-config.yaml | 4 ++-- .pylintrc | 5 ++--- .pylintrc-mandatory | 8 ++++---- .ruff.toml | 1 + account_ebics/models/ebics_config.py | 2 +- account_ebics/models/ebics_file.py | 6 +++--- oca_dependencies.txt | 10 ++++++++++ 11 files changed, 26 insertions(+), 35 deletions(-) delete mode 100644 .flake8 create mode 100644 oca_dependencies.txt diff --git a/.copier-answers.yml b/.copier-answers.yml index caa56a2..ca1fff7 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,17 +1,12 @@ # Do NOT update manually; changes here will be overwritten by Copier -_commit: v2.2 +_commit: v3.1 _src_path: https://picasso.noviat.com/ci/addons-repo-template.git ci_exclude_modules: account_asset -ci_image: ghcr.io/oca/oca-ci/py3.10-odoo17.0:latest customer_slug: Noviat_Generic -generate_requirements_txt: true odoo_enterprise: 1 odoo_version: 17.0 -org_name: Noviat org_slug: Noviat repo_name: Modules dedicated to manage the EBICS protocol repo_slug: accounting-ebics -repo_website: https://www.noviat.com/ -use_pyproject_toml: false -use_ruff: false +repo_type: Customer/Generic Addons diff --git a/.flake8 b/.flake8 deleted file mode 100644 index e397e8e..0000000 --- a/.flake8 +++ /dev/null @@ -1,12 +0,0 @@ -[flake8] -max-line-length = 88 -max-complexity = 16 -# B = bugbear -# B9 = bugbear opinionated (incl line length) -select = C,E,F,W,B,B9 -# E203: whitespace before ':' (black behaviour) -# E501: flake8 line length (covered by bugbear B950) -# W503: line break before binary operator (black behaviour) -ignore = E203,E501,W503 -per-file-ignores= - __init__.py:F401 diff --git a/.gitignore b/.gitignore index 0090721..16a389c 100644 --- a/.gitignore +++ b/.gitignore @@ -70,6 +70,3 @@ docs/_build/ # Backup files *~ *.swp - -# OCA rules -!static/lib/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2dc110f..529a484 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,4 +10,5 @@ variables: ENTERPRISE: "1" ODOO_PRECOMMIT: "1" ODOO_TEST: "1" + ODOO_GENERATE_POT: "1" EXCLUDE_MODULES: "account_asset" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f5c678d..8445d64 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -41,7 +41,7 @@ repos: hooks: - id: whool-init - repo: https://github.com/oca/maintainer-tools - rev: f71041f22b8cd68cf7c77b73a14ca8d8cd190a60 + rev: 9a170331575a265c092ee6b24b845ec508e8ef75 hooks: # update the NOT INSTALLABLE ADDONS section above - id: oca-update-pre-commit-excluded-addons @@ -101,7 +101,7 @@ repos: args: [--fix, --exit-non-zero-on-fix] - id: ruff-format - repo: https://github.com/OCA/pylint-odoo - rev: v8.0.19 + rev: v9.0.4 hooks: - id: pylint_odoo name: pylint with optional checks diff --git a/.pylintrc b/.pylintrc index cfb1c50..d3df364 100644 --- a/.pylintrc +++ b/.pylintrc @@ -1,12 +1,11 @@ - [MASTER] ignore-patterns=["^.*/TODO/.*$"] load-plugins=pylint_odoo score=n [ODOOLINT] -# readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst" +#readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst" manifest-required-authors=Noviat manifest-required-keys=license manifest-deprecated-keys=description,active @@ -42,7 +41,7 @@ enable=anomalous-backslash-in-string, license-allowed, manifest-author-string, manifest-deprecated-key, - manifest-required-author, + # manifest-required-author, manifest-required-key, manifest-version-format, method-compute, diff --git a/.pylintrc-mandatory b/.pylintrc-mandatory index aa871c1..b1b8fc2 100644 --- a/.pylintrc-mandatory +++ b/.pylintrc-mandatory @@ -1,11 +1,11 @@ - [MASTER] +ignore-patterns=["^.*/TODO/.*$"] load-plugins=pylint_odoo score=n [ODOOLINT] -readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst" -manifest-required-authors=Odoo Community Association (OCA) +#readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst" +manifest-required-authors=Noviat manifest-required-keys=license manifest-deprecated-keys=description,active license-allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3 @@ -33,7 +33,7 @@ enable=anomalous-backslash-in-string, license-allowed, manifest-author-string, manifest-deprecated-key, - manifest-required-author, + # manifest-required-author, manifest-required-key, manifest-version-format, method-compute, diff --git a/.ruff.toml b/.ruff.toml index 634db8e..0240c75 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 ] diff --git a/account_ebics/models/ebics_config.py b/account_ebics/models/ebics_config.py index 0914307..5582092 100644 --- a/account_ebics/models/ebics_config.py +++ b/account_ebics/models/ebics_config.py @@ -148,7 +148,7 @@ class EbicsConfig(models.Model): ok = False if not ok: raise UserError( - _( + _( # pylint: disable=W8120 "Order Number should comply with the following pattern:" "\n[A-Z]{1}[A-Z0-9]{3}" ) diff --git a/account_ebics/models/ebics_file.py b/account_ebics/models/ebics_file.py index fc78cb2..1979643 100644 --- a/account_ebics/models/ebics_file.py +++ b/account_ebics/models/ebics_file.py @@ -1,4 +1,4 @@ -# Copyright 2009-2023 Noviat. +# Copyright 2009-2024 Noviat. # License LGPL-3 or later (http://www.gnu.org/licenses/lgpl). import base64 @@ -168,8 +168,8 @@ class EbicsFile(models.Model): if raise_if_not_found: raise UserError( _( - "The module to process the '%(ebics_format)s' format is not installed " - "on your system. " + "The module to process the '%(ebics_format)s' format is not " + "installed on your system. " "\nPlease install module '%(module)s'", ebics_format=self.format_id.name, module=module, diff --git a/oca_dependencies.txt b/oca_dependencies.txt new file mode 100644 index 0000000..f7b0d50 --- /dev/null +++ b/oca_dependencies.txt @@ -0,0 +1,10 @@ +# See https://github.com/OCA/maintainer-quality-tools/blob/master/travis/clone_oca_dependencies +# The expected format for oca_dependencies.txt: +# * comment lines start with # and are ignored +# * a dependency line contains: +# - the name of the OCA project +# - (optional) the URL to the git repository (defaulting to the OCA repository) +# - (optional) the name of the branch to use (defaulting to ${VERSION}). It is +# required if you want to select a commit SHA in the next parameter. +# - (optional) the commit SHA1 to use. If you set this option you MUST specify +# the branch