Skip to content

Commit

Permalink
[MIG] repo version 15.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mileo committed May 21, 2024
1 parent 798ca45 commit d991aba
Show file tree
Hide file tree
Showing 8 changed files with 97 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ github_enable_stale_action: true
github_enforce_dev_status_compatibility: true
include_wkhtmltopdf: true
odoo_test_flavor: OCB
odoo_version: 14.0
odoo_version: 15.0
org_name: KMEE, Odoo Community Association (OCA)
org_slug: KMEE
rebel_module_groups: []
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: pre-commit
on:
pull_request:
branches:
- "14.0*"
- "15.0*"
push:
branches:
- "14.0"
- "14.0-ocabot-*"
- "15.0"
- "15.0-ocabot-*"

jobs:
pre-commit:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: tests
on:
pull_request:
branches:
- "14.0*"
- "15.0*"
push:
branches:
- "14.0"
- "14.0-ocabot-*"
- "15.0"
- "15.0-ocabot-*"

jobs:
unreleased-deps:
Expand Down Expand Up @@ -35,7 +35,7 @@ jobs:
fail-fast: false
matrix:
include:
- container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest
- container: ghcr.io/oca/oca-ci/py3.8-ocb15.0:latest
name: test with OCB
makepot: "true"
services:
Expand Down
2 changes: 0 additions & 2 deletions .oca_hooks.cfg

This file was deleted.

22 changes: 11 additions & 11 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ exclude: |
(LICENSE.*|COPYING.*)
default_language_version:
python: python3
node: "14.13.0"
node: "14.18.0"
repos:
- repo: local
hooks:
Expand All @@ -48,7 +48,7 @@ repos:
- id: oca-gen-addon-readme
args:
- --addons-dir=.
- --branch=14.0
- --branch=15.0
- --org-name=KMEE
- --repo-name=kmee-odoo-addons
- --if-source-changed
Expand All @@ -74,26 +74,26 @@ repos:
hooks:
- id: black
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.1.2
rev: v2.4.1
hooks:
- id: prettier
name: prettier (with plugin-xml)
additional_dependencies:
- "prettier@2.1.2"
- "@prettier/plugin-xml@0.12.0"
- "prettier@2.4.1"
- "@prettier/plugin-xml@1.1.0"
args:
- --plugin=@prettier/plugin-xml
files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$
- repo: https://github.com/pre-commit/mirrors-eslint
rev: v7.8.1
rev: v7.32.0
hooks:
- id: eslint
verbose: true
args:
- --color
- --fix
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.2.0
rev: v4.0.1
hooks:
- id: trailing-whitespace
# exclude autogenerated files
Expand All @@ -115,7 +115,7 @@ repos:
- id: mixed-line-ending
args: ["--fix=lf"]
- repo: https://github.com/asottile/pyupgrade
rev: v2.7.2
rev: v2.29.0
hooks:
- id: pyupgrade
args: ["--keep-percent-format"]
Expand All @@ -138,13 +138,13 @@ repos:
- --header
- "# generated from manifests external_dependencies"
- repo: https://github.com/PyCQA/flake8
rev: 3.8.3
rev: 3.9.2
hooks:
- id: flake8
name: flake8
additional_dependencies: ["flake8-bugbear==20.1.4"]
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
Expand Down
37 changes: 37 additions & 0 deletions .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,13 @@ readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/templat
manifest_required_authors=KMEE
manifest_required_keys=license
manifest_deprecated_keys=description,active
<<<<<<< before updating
license_allowed=LGPL-3
valid_odoo_versions=14.0
=======
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=15.0
>>>>>>> after updating

[MESSAGES CONTROL]
disable=all
Expand Down Expand Up @@ -66,6 +71,38 @@ enable=anomalous-backslash-in-string,
use-vim-comment,
wrong-tabs-instead-of-spaces,
xml-syntax-error,
attribute-string-redundant,
character-not-valid-in-resource-link,
consider-merging-classes-inherited,
context-overridden,
create-user-wo-reset-password,
dangerous-filter-wo-user,
dangerous-qweb-replace-wo-priority,
deprecated-data-xml-node,
deprecated-openerp-xml-node,
duplicate-po-message-definition,
except-pass,
file-not-used,
invalid-commit,
manifest-maintainers-list,
missing-newline-extrafiles,
missing-readme,
missing-return,
odoo-addons-relative-import,
old-api7-method-defined,
po-msgstr-variables,
po-syntax-error,
renamed-field-parameter,
resource-not-exist,
str-format-used,
test-folder-imported,
translation-contains-variable,
translation-positional-used,
unnecessary-utf8-coding-comment,
website-manifest-key-not-valid-uri,
xml-attribute-translatable,
xml-deprecated-qweb-directive,
xml-deprecated-tree-attribute,
# messages that do not cause the lint step to fail
consider-merging-classes-inherited,
create-user-wo-reset-password,
Expand Down
39 changes: 38 additions & 1 deletion .pylintrc-mandatory
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,13 @@ readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/templat
manifest_required_authors=KMEE
manifest_required_keys=license
manifest_deprecated_keys=description,active
<<<<<<< before updating
license_allowed=LGPL-3
valid_odoo_versions=14.0
=======
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=15.0
>>>>>>> after updating

[MESSAGES CONTROL]
disable=all
Expand Down Expand Up @@ -57,7 +62,39 @@ enable=anomalous-backslash-in-string,
unreachable,
use-vim-comment,
wrong-tabs-instead-of-spaces,
xml-syntax-error
xml-syntax-error,
attribute-string-redundant,
character-not-valid-in-resource-link,
consider-merging-classes-inherited,
context-overridden,
create-user-wo-reset-password,
dangerous-filter-wo-user,
dangerous-qweb-replace-wo-priority,
deprecated-data-xml-node,
deprecated-openerp-xml-node,
duplicate-po-message-definition,
except-pass,
file-not-used,
invalid-commit,
manifest-maintainers-list,
missing-newline-extrafiles,
missing-readme,
missing-return,
odoo-addons-relative-import,
old-api7-method-defined,
po-msgstr-variables,
po-syntax-error,
renamed-field-parameter,
resource-not-exist,
str-format-used,
test-folder-imported,
translation-contains-variable,
translation-positional-used,
unnecessary-utf8-coding-comment,
website-manifest-key-not-valid-uri,
xml-attribute-translatable,
xml-deprecated-qweb-directive,
xml-deprecated-tree-attribute

[REPORTS]
msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg}
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

<!-- /!\ Non OCA Context : Set here the badge of your runbot / runboat instance. -->
[![Pre-commit Status](https://github.com/KMEE/kmee-odoo-addons/actions/workflows/pre-commit.yml/badge.svg?branch=14.0)](https://github.com/KMEE/kmee-odoo-addons/actions/workflows/pre-commit.yml?query=branch%3A14.0)
[![Build Status](https://github.com/KMEE/kmee-odoo-addons/actions/workflows/test.yml/badge.svg?branch=14.0)](https://github.com/KMEE/kmee-odoo-addons/actions/workflows/test.yml?query=branch%3A14.0)
[![codecov](https://codecov.io/gh/KMEE/kmee-odoo-addons/branch/14.0/graph/badge.svg)](https://codecov.io/gh/KMEE/kmee-odoo-addons)
[![Pre-commit Status](https://github.com/KMEE/kmee-odoo-addons/actions/workflows/pre-commit.yml/badge.svg?branch=15.0)](https://github.com/KMEE/kmee-odoo-addons/actions/workflows/pre-commit.yml?query=branch%3A15.0)
[![Build Status](https://github.com/KMEE/kmee-odoo-addons/actions/workflows/test.yml/badge.svg?branch=15.0)](https://github.com/KMEE/kmee-odoo-addons/actions/workflows/test.yml?query=branch%3A15.0)
[![codecov](https://codecov.io/gh/KMEE/kmee-odoo-addons/branch/15.0/graph/badge.svg)](https://codecov.io/gh/KMEE/kmee-odoo-addons)
<!-- /!\ Non OCA Context : Set here the badge of your translation instance. -->

<!-- /!\ do not modify above this line -->
Expand Down

0 comments on commit d991aba

Please sign in to comment.