Skip to content

Commit

Permalink
Merge PR #552 into 15.0
Browse files Browse the repository at this point in the history
Signed-off-by dreispt
  • Loading branch information
OCA-git-bot committed Nov 17, 2023
2 parents 2e6db3e + 93dde48 commit 79b1744
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 63 deletions.
6 changes: 2 additions & 4 deletions .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -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: gh:oca/oca-addons-repo-template
ci: GitHub
dependency_installation_mode: PIP
generate_requirements_txt: true
github_check_license: true
github_ci_extra_env: {}
Expand All @@ -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
Expand All @@ -19,6 +19,4 @@ repo_description: Odoo modules to support management systems
repo_name: Management System
repo_slug: management-system
repo_website: https://github.com/OCA/management-system
travis_apt_packages: []
travis_apt_sources: []

1 change: 1 addition & 0 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 13 additions & 2 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ jobs:
pre-commit:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v4
- 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
Expand All @@ -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)"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
46 changes: 28 additions & 18 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ 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:
python: python3
node: "14.18.0"
node: "16.17.0"
repos:
- repo: local
hooks:
Expand All @@ -33,14 +35,26 @@ 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/management-system"]
- id: oca-gen-addon-readme
args:
- --addons-dir=.
- --branch=16.0
- --org-name=OCA
- --repo-name=management-system
- --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
rev: v1.6.1
hooks:
- id: autoflake
args:
Expand All @@ -51,30 +65,30 @@ repos:
- --remove-duplicate-keys
- --remove-unused-variables
- repo: https://github.com/psf/black
rev: 22.3.0
rev: 22.8.0
hooks:
- id: black
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.4.1
rev: v2.7.1
hooks:
- id: prettier
name: prettier (with plugin-xml)
additional_dependencies:
- "prettier@2.4.1"
- "@prettier/plugin-xml@1.1.0"
- "prettier@2.7.1"
- "@prettier/plugin-xml@2.2.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.32.0
rev: v8.24.0
hooks:
- id: eslint
verbose: true
args:
- --color
- --fix
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.0.1
rev: v4.3.0
hooks:
- id: trailing-whitespace
# exclude autogenerated files
Expand All @@ -96,7 +110,7 @@ repos:
- id: mixed-line-ending
args: ["--fix=lf"]
- repo: https://github.com/asottile/pyupgrade
rev: v2.29.0
rev: v2.38.2
hooks:
- id: pyupgrade
args: ["--keep-percent-format"]
Expand Down Expand Up @@ -124,19 +138,15 @@ repos:
- id: flake8
name: flake8
additional_dependencies: ["flake8-bugbear==21.9.2"]
- repo: https://github.com/PyCQA/pylint
rev: v2.11.1
- repo: https://github.com/OCA/pylint-odoo
rev: v8.0.19
hooks:
- id: pylint
- id: pylint_odoo
name: pylint with optional checks
args:
- --rcfile=.pylintrc
- --exit-zero
verbose: true
additional_dependencies: &pylint_deps
- pylint-odoo==5.0.5
- id: pylint
name: pylint with mandatory checks
- id: pylint_odoo
args:
- --rcfile=.pylintrc-mandatory
additional_dependencies: *pylint_deps
6 changes: 0 additions & 6 deletions mgmtsystem_action/i18n/mgmtsystem_action.pot
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,6 @@ msgstr ""

#. module: mgmtsystem_action
#: model:ir.model.fields,help:mgmtsystem_action.field_mgmtsystem_action__message_has_error
#: model:ir.model.fields,help:mgmtsystem_action.field_mgmtsystem_action__message_has_sms_error
msgid "If checked, some messages have a delivery error."
msgstr ""

Expand Down Expand Up @@ -597,11 +596,6 @@ msgstr ""
msgid "Responsible User"
msgstr ""

#. module: mgmtsystem_action
#: model:ir.model.fields,field_description:mgmtsystem_action.field_mgmtsystem_action__message_has_sms_error
msgid "SMS Delivery error"
msgstr ""

#. module: mgmtsystem_action
#: model:ir.model.fields,field_description:mgmtsystem_action.field_mgmtsystem_action__sequence
#: model:ir.model.fields,field_description:mgmtsystem_action.field_mgmtsystem_action_stage__sequence
Expand Down
6 changes: 0 additions & 6 deletions mgmtsystem_audit/i18n/mgmtsystem_audit.pot
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,6 @@ msgstr ""

#. module: mgmtsystem_audit
#: model:ir.model.fields,help:mgmtsystem_audit.field_mgmtsystem_audit__message_has_error
#: model:ir.model.fields,help:mgmtsystem_audit.field_mgmtsystem_audit__message_has_sms_error
msgid "If checked, some messages have a delivery error."
msgstr ""

Expand Down Expand Up @@ -555,11 +554,6 @@ msgstr ""
msgid "Responsible User"
msgstr ""

#. module: mgmtsystem_audit
#: model:ir.model.fields,field_description:mgmtsystem_audit.field_mgmtsystem_audit__message_has_sms_error
msgid "SMS Delivery error"
msgstr ""

#. module: mgmtsystem_audit
#: model:mail.template,name:mgmtsystem_audit.template_email_send_verification_list
msgid "Send Verification List"
Expand Down
6 changes: 0 additions & 6 deletions mgmtsystem_claim/i18n/mgmtsystem_claim.pot
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,6 @@ msgstr ""

#. module: mgmtsystem_claim
#: model:ir.model.fields,help:mgmtsystem_claim.field_mgmtsystem_claim__message_has_error
#: model:ir.model.fields,help:mgmtsystem_claim.field_mgmtsystem_claim__message_has_sms_error
msgid "If checked, some messages have a delivery error."
msgstr ""

Expand Down Expand Up @@ -577,11 +576,6 @@ msgstr ""
msgid "Root Causes"
msgstr ""

#. module: mgmtsystem_claim
#: model:ir.model.fields,field_description:mgmtsystem_claim.field_mgmtsystem_claim__message_has_sms_error
msgid "SMS Delivery error"
msgstr ""

#. module: mgmtsystem_claim
#: model:ir.model.fields,field_description:mgmtsystem_claim.field_mgmtsystem_claim__team_id
msgid "Sales Team"
Expand Down
6 changes: 0 additions & 6 deletions mgmtsystem_hazard/i18n/mgmtsystem_hazard.pot
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,6 @@ msgstr ""

#. module: mgmtsystem_hazard
#: model:ir.model.fields,help:mgmtsystem_hazard.field_mgmtsystem_hazard__message_has_error
#: model:ir.model.fields,help:mgmtsystem_hazard.field_mgmtsystem_hazard__message_has_sms_error
msgid "If checked, some messages have a delivery error."
msgstr ""

Expand Down Expand Up @@ -488,11 +487,6 @@ msgstr ""
msgid "Review Date"
msgstr ""

#. module: mgmtsystem_hazard
#: model:ir.model.fields,field_description:mgmtsystem_hazard.field_mgmtsystem_hazard__message_has_sms_error
msgid "SMS Delivery error"
msgstr ""

#. module: mgmtsystem_hazard
#: model:ir.actions.act_window,name:mgmtsystem_hazard.open_mgmtsystem_hazard_severity_list
#: model:ir.ui.menu,name:mgmtsystem_hazard.menu_open_hazard_severity
Expand Down
6 changes: 0 additions & 6 deletions mgmtsystem_nonconformity/i18n/mgmtsystem_nonconformity.pot
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,6 @@ msgstr ""

#. module: mgmtsystem_nonconformity
#: model:ir.model.fields,help:mgmtsystem_nonconformity.field_mgmtsystem_nonconformity__message_has_error
#: model:ir.model.fields,help:mgmtsystem_nonconformity.field_mgmtsystem_nonconformity__message_has_sms_error
msgid "If checked, some messages have a delivery error."
msgstr ""

Expand Down Expand Up @@ -796,11 +795,6 @@ msgstr ""
msgid "Responsible User"
msgstr ""

#. module: mgmtsystem_nonconformity
#: model:ir.model.fields,field_description:mgmtsystem_nonconformity.field_mgmtsystem_nonconformity__message_has_sms_error
msgid "SMS Delivery error"
msgstr ""

#. module: mgmtsystem_nonconformity
#: model:ir.model.fields,field_description:mgmtsystem_nonconformity.field_mgmtsystem_nonconformity_cause__sequence
#: model:ir.model.fields,field_description:mgmtsystem_nonconformity.field_mgmtsystem_nonconformity_origin__sequence
Expand Down
6 changes: 0 additions & 6 deletions mgmtsystem_review/i18n/mgmtsystem_review.pot
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,6 @@ msgstr ""

#. module: mgmtsystem_review
#: model:ir.model.fields,help:mgmtsystem_review.field_mgmtsystem_review__message_has_error
#: model:ir.model.fields,help:mgmtsystem_review.field_mgmtsystem_review__message_has_sms_error
msgid "If checked, some messages have a delivery error."
msgstr ""

Expand Down Expand Up @@ -425,11 +424,6 @@ msgstr ""
msgid "Reviews"
msgstr ""

#. module: mgmtsystem_review
#: model:ir.model.fields,field_description:mgmtsystem_review.field_mgmtsystem_review__message_has_sms_error
msgid "SMS Delivery error"
msgstr ""

#. module: mgmtsystem_review
#: model:ir.model.fields,field_description:mgmtsystem_review.field_mgmtsystem_review__state
msgid "State"
Expand Down

0 comments on commit 79b1744

Please sign in to comment.