From b221a2e3fce00101b758f4150952328df6525e7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 12 Nov 2023 14:42:42 +0100 Subject: [PATCH] [IMP] update dotfiles for 18.0 --- .copier-answers.yml | 5 +++-- .github/workflows/pre-commit.yml | 6 +++--- .github/workflows/test.yml | 12 +++++++----- .gitignore | 4 ++++ .pre-commit-config.yaml | 14 ++++++++------ .pylintrc | 2 +- .pylintrc-mandatory | 2 +- .ruff.toml | 8 ++++---- README.md | 10 +++++----- 9 files changed, 36 insertions(+), 27 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index f5f56ef83..1a20cb757 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,9 +1,10 @@ # Do NOT update manually; changes here will be overwritten by Copier -_commit: v1.24 +_commit: v1.26 _src_path: git+https://github.com/OCA/oca-addons-repo-template additional_ruff_rules: [] ci: GitHub convert_readme_fragments_to_markdown: true +enable_checklog_odoo: true generate_requirements_txt: true github_check_license: true github_ci_extra_env: {} @@ -13,7 +14,7 @@ github_enable_stale_action: true github_enforce_dev_status_compatibility: true include_wkhtmltopdf: false odoo_test_flavor: Both -odoo_version: 17.0 +odoo_version: 18.0 org_name: Odoo Community Association (OCA) org_slug: OCA rebel_module_groups: [] diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index c58f6292e..b53a386cf 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -3,11 +3,11 @@ name: pre-commit on: pull_request: branches: - - "17.0*" + - "18.0*" push: branches: - - "17.0" - - "17.0-ocabot-*" + - "18.0" + - "18.0-ocabot-*" jobs: pre-commit: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 03c1acbbc..6f4b2fd52 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,11 +3,11 @@ name: tests on: pull_request: branches: - - "17.0*" + - "18.0*" push: branches: - - "17.0" - - "17.0-ocabot-*" + - "18.0" + - "18.0-ocabot-*" jobs: unreleased-deps: @@ -35,9 +35,9 @@ jobs: fail-fast: false matrix: include: - - container: ghcr.io/oca/oca-ci/py3.10-odoo17.0:latest + - container: ghcr.io/oca/oca-ci/py3.10-odoo18.0:latest name: test with Odoo - - container: ghcr.io/oca/oca-ci/py3.10-ocb17.0:latest + - container: ghcr.io/oca/oca-ci/py3.10-ocb18.0:latest name: test with OCB makepot: "true" services: @@ -49,6 +49,8 @@ jobs: POSTGRES_DB: odoo ports: - 5432:5432 + env: + OCA_ENABLE_CHECKLOG_ODOO: "1" steps: - uses: actions/checkout@v3 with: diff --git a/.gitignore b/.gitignore index 2b045db39..6ec07a054 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,9 @@ var/ *.egg *.eggs +# Windows installers +*.msi + # Debian packages *.deb @@ -33,6 +36,7 @@ var/ # MacOS packages *.dmg +*.pkg # Installer logs pip-log.txt diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1b12aaf20..8b2b4985c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -39,11 +39,11 @@ repos: language: fail files: '[a-zA-Z0-9_]*/i18n/en\.po$' - repo: https://github.com/sbidoul/whool - rev: v0.5 + rev: v1.2 hooks: - id: whool-init - repo: https://github.com/oca/maintainer-tools - rev: d5fab7ee87fceee858a3d01048c78a548974d935 + rev: bf9ecb9938b6a5deca0ff3d870fbd3f33341fded hooks: # update the NOT INSTALLABLE ADDONS section above - id: oca-update-pre-commit-excluded-addons @@ -52,7 +52,7 @@ repos: - id: oca-gen-addon-readme args: - --addons-dir=. - - --branch=17.0 + - --branch=18.0 - --org-name=OCA - --repo-name=mis-builder - --if-source-changed @@ -60,10 +60,12 @@ repos: - --convert-fragments-to-markdown - id: oca-gen-external-dependencies - repo: https://github.com/OCA/odoo-pre-commit-hooks - rev: v0.0.25 + rev: v0.0.33 hooks: - id: oca-checks-odoo-module - id: oca-checks-po + args: + - --disable=po-pretty-format - repo: https://github.com/pre-commit/mirrors-prettier rev: v2.7.1 hooks: @@ -84,7 +86,7 @@ repos: - --color - --fix - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.3.0 + rev: v4.6.0 hooks: - id: trailing-whitespace # exclude autogenerated files @@ -106,7 +108,7 @@ repos: - id: mixed-line-ending args: ["--fix=lf"] - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.1.3 + rev: v0.6.8 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] diff --git a/.pylintrc b/.pylintrc index 874f69669..7c62b6d2e 100644 --- a/.pylintrc +++ b/.pylintrc @@ -10,7 +10,7 @@ manifest-required-authors=Odoo Community Association (OCA) 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 -valid-odoo-versions=17.0 +valid-odoo-versions=18.0 [MESSAGES CONTROL] disable=all diff --git a/.pylintrc-mandatory b/.pylintrc-mandatory index 0d7ae0807..018fd61cd 100644 --- a/.pylintrc-mandatory +++ b/.pylintrc-mandatory @@ -9,7 +9,7 @@ manifest-required-authors=Odoo Community Association (OCA) 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 -valid-odoo-versions=17.0 +valid-odoo-versions=18.0 [MESSAGES CONTROL] disable=all diff --git a/.ruff.toml b/.ruff.toml index 0240c75f6..0f1e35f24 100644 --- a/.ruff.toml +++ b/.ruff.toml @@ -15,16 +15,16 @@ exclude = ["setup/*"] [format] exclude = ["setup/*"] -[per-file-ignores] +[lint.per-file-ignores] "__init__.py" = ["F401", "I001"] # ignore unused and unsorted imports in __init__.py "__manifest__.py" = ["B018"] # useless expression -[isort] +[lint.isort] section-order = ["future", "standard-library", "third-party", "odoo", "odoo-addons", "first-party", "local-folder"] -[isort.sections] +[lint.isort.sections] "odoo" = ["odoo"] "odoo-addons" = ["odoo.addons"] -[mccabe] +[lint.mccabe] max-complexity = 16 diff --git a/README.md b/README.md index 9b2226866..5c5e62a60 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ -[![Runboat](https://img.shields.io/badge/runboat-Try%20me-875A7B.png)](https://runboat.odoo-community.org/builds?repo=OCA/mis-builder&target_branch=17.0) -[![Pre-commit Status](https://github.com/OCA/mis-builder/actions/workflows/pre-commit.yml/badge.svg?branch=17.0)](https://github.com/OCA/mis-builder/actions/workflows/pre-commit.yml?query=branch%3A17.0) -[![Build Status](https://github.com/OCA/mis-builder/actions/workflows/test.yml/badge.svg?branch=17.0)](https://github.com/OCA/mis-builder/actions/workflows/test.yml?query=branch%3A17.0) -[![codecov](https://codecov.io/gh/OCA/mis-builder/branch/17.0/graph/badge.svg)](https://codecov.io/gh/OCA/mis-builder) -[![Translation Status](https://translation.odoo-community.org/widgets/mis-builder-17-0/-/svg-badge.svg)](https://translation.odoo-community.org/engage/mis-builder-17-0/?utm_source=widget) +[![Runboat](https://img.shields.io/badge/runboat-Try%20me-875A7B.png)](https://runboat.odoo-community.org/builds?repo=OCA/mis-builder&target_branch=18.0) +[![Pre-commit Status](https://github.com/OCA/mis-builder/actions/workflows/pre-commit.yml/badge.svg?branch=18.0)](https://github.com/OCA/mis-builder/actions/workflows/pre-commit.yml?query=branch%3A18.0) +[![Build Status](https://github.com/OCA/mis-builder/actions/workflows/test.yml/badge.svg?branch=18.0)](https://github.com/OCA/mis-builder/actions/workflows/test.yml?query=branch%3A18.0) +[![codecov](https://codecov.io/gh/OCA/mis-builder/branch/18.0/graph/badge.svg)](https://codecov.io/gh/OCA/mis-builder) +[![Translation Status](https://translation.odoo-community.org/widgets/mis-builder-18-0/-/svg-badge.svg)](https://translation.odoo-community.org/engage/mis-builder-18-0/?utm_source=widget)