diff --git a/.copier-answers.yml b/.copier-answers.yml index bb1b8c8e252..4d709693db6 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: gh: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 @@ -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: [] diff --git a/.eslintrc.yml b/.eslintrc.yml index 9429bc688aa..fed88d70d23 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 94ecb75d553..745e3bbde2f 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/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 @@ -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 7fc809fb427..5c07e37d080 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 b40f86263dd..c5cd2edcaf0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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: @@ -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: @@ -51,22 +65,22 @@ 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 @@ -74,7 +88,7 @@ repos: - --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 @@ -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"] @@ -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 diff --git a/mgmtsystem_action/i18n/mgmtsystem_action.pot b/mgmtsystem_action/i18n/mgmtsystem_action.pot index e553c0094ef..adb1536089e 100644 --- a/mgmtsystem_action/i18n/mgmtsystem_action.pot +++ b/mgmtsystem_action/i18n/mgmtsystem_action.pot @@ -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 "" @@ -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 diff --git a/mgmtsystem_audit/i18n/mgmtsystem_audit.pot b/mgmtsystem_audit/i18n/mgmtsystem_audit.pot index f713a7576a4..ee819ab796c 100644 --- a/mgmtsystem_audit/i18n/mgmtsystem_audit.pot +++ b/mgmtsystem_audit/i18n/mgmtsystem_audit.pot @@ -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 "" @@ -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" diff --git a/mgmtsystem_claim/i18n/mgmtsystem_claim.pot b/mgmtsystem_claim/i18n/mgmtsystem_claim.pot index d7a0f458522..99e77c2b39d 100644 --- a/mgmtsystem_claim/i18n/mgmtsystem_claim.pot +++ b/mgmtsystem_claim/i18n/mgmtsystem_claim.pot @@ -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 "" @@ -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" diff --git a/mgmtsystem_hazard/i18n/mgmtsystem_hazard.pot b/mgmtsystem_hazard/i18n/mgmtsystem_hazard.pot index 6f1b8201979..6f2e4e3ef2a 100644 --- a/mgmtsystem_hazard/i18n/mgmtsystem_hazard.pot +++ b/mgmtsystem_hazard/i18n/mgmtsystem_hazard.pot @@ -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 "" @@ -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 diff --git a/mgmtsystem_nonconformity/i18n/mgmtsystem_nonconformity.pot b/mgmtsystem_nonconformity/i18n/mgmtsystem_nonconformity.pot index 3c30010cef3..3d2b85f208a 100644 --- a/mgmtsystem_nonconformity/i18n/mgmtsystem_nonconformity.pot +++ b/mgmtsystem_nonconformity/i18n/mgmtsystem_nonconformity.pot @@ -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 "" @@ -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 diff --git a/mgmtsystem_review/i18n/mgmtsystem_review.pot b/mgmtsystem_review/i18n/mgmtsystem_review.pot index ee52d38145f..1a8fa8d445c 100644 --- a/mgmtsystem_review/i18n/mgmtsystem_review.pot +++ b/mgmtsystem_review/i18n/mgmtsystem_review.pot @@ -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 "" @@ -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"