From 5fec1e8fe58b70b0f05007df313d4c697b909998 Mon Sep 17 00:00:00 2001 From: oca-git-bot Date: Wed, 1 May 2024 18:01:49 +0000 Subject: [PATCH 1/3] [IMP] update dotfiles --- .copier-answers.yml | 9 +++++---- .eslintrc.yml | 1 + .github/workflows/pre-commit.yml | 16 ++++++++++++++++ .github/workflows/stale.yml | 4 ++-- .github/workflows/test.yml | 10 ++++++---- .gitignore | 1 + .oca_hooks.cfg | 2 ++ .pre-commit-config.yaml | 21 ++++++++++++++++++++- 8 files changed, 53 insertions(+), 11 deletions(-) create mode 100644 .oca_hooks.cfg diff --git a/.copier-answers.yml b/.copier-answers.yml index 0f0889f6e..fb0ea8d33 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,8 +1,8 @@ # Do NOT update manually; changes here will be overwritten by Copier -_commit: v1.14.2 +_commit: v1.21.1 _src_path: gh:oca/oca-addons-repo-template ci: GitHub -dependency_installation_mode: PIP +convert_readme_fragments_to_markdown: false generate_requirements_txt: true github_check_license: true github_ci_extra_env: {} @@ -11,6 +11,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: 14.0 org_name: Odoo Community Association (OCA) org_slug: OCA @@ -19,6 +20,6 @@ repo_description: Tools for telephony services and phone number rendering repo_name: connector-telephony repo_slug: connector-telephony repo_website: https://github.com/OCA/connector-telephony -travis_apt_packages: [] -travis_apt_sources: [] +use_pyproject_toml: false +use_ruff: false diff --git a/.eslintrc.yml b/.eslintrc.yml index 9429bc688..fed88d70d 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 5cdd68ed3..9d085e5aa 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -13,10 +13,17 @@ jobs: pre-commit: runs-on: ubuntu-22.04 steps: +<<<<<<< before updating - uses: actions/checkout@v2 - uses: actions/setup-python@v4 with: python-version: "3.10" +======= + - uses: actions/checkout@v3 + - uses: actions/setup-python@v2 + with: + python-version: "3.11" +>>>>>>> after updating - name: Get python version run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV - uses: actions/cache@v1 @@ -27,6 +34,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/stale.yml b/.github/workflows/stale.yml index 1693a1253..fa17fcd4e 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Stale PRs and issues policy - uses: actions/stale@v4 + uses: actions/stale@v9 with: repo-token: ${{ secrets.GITHUB_TOKEN }} # General settings. @@ -48,7 +48,7 @@ jobs: # * Issues that are pending more information # * Except Issues marked as "no stale" - name: Needs more information stale issues policy - uses: actions/stale@v4 + uses: actions/stale@v9 with: repo-token: ${{ secrets.GITHUB_TOKEN }} ascending: true diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 215b84b0f..d069c6a2a 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.6-odoo14.0:latest - makepot: "true" name: test with Odoo - container: ghcr.io/oca/oca-ci/py3.6-ocb14.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 @@ -63,7 +63,9 @@ jobs: run: oca_init_test_database - name: Run tests run: oca_run_tests - - uses: codecov/codecov-action@v1 + - uses: codecov/codecov-action@v4 + with: + token: ${{ secrets.CODECOV_TOKEN }} - name: Update .pot files run: oca_export_and_push_pot https://x-access-token:${{ secrets.GIT_PUSH_TOKEN }}@github.com/${{ github.repository }} if: ${{ matrix.makepot == 'true' && github.event_name == 'push' && github.repository_owner == 'OCA' }} diff --git a/.gitignore b/.gitignore index 9c283fd41..0090721f5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ __pycache__/ *.py[cod] /.venv /.pytest_cache +/.ruff_cache # C extensions *.so diff --git a/.oca_hooks.cfg b/.oca_hooks.cfg new file mode 100644 index 000000000..1f3e3e426 --- /dev/null +++ b/.oca_hooks.cfg @@ -0,0 +1,2 @@ +[MESSAGES_CONTROL] +disable=xml-deprecated-data-node,xml-deprecated-tree-attribute diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 64f99c5b9..3d7d4f962 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,6 +12,12 @@ 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)$| + # Ignore build and dist directories in addons + /build/|/dist/| + # Ignore test files in addons + /tests/samples/.*| # You don't usually want a bot to modify your legal texts (LICENSE.*|COPYING.*) default_language_version: @@ -33,12 +39,25 @@ repos: language: fail files: '[a-zA-Z0-9_]*/i18n/en\.po$' - repo: https://github.com/oca/maintainer-tools - rev: ab1d7f6 + rev: 9a170331575a265c092ee6b24b845ec508e8ef75 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/connector-telephony"] + - id: oca-gen-addon-readme + args: + - --addons-dir=. + - --branch=14.0 + - --org-name=OCA + - --repo-name=connector-telephony + - --if-source-changed + - --keep-source-digest + - 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 hooks: From 5001cd77da4fc353388c08291ff305c0a9617ceb Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Thu, 2 May 2024 16:34:07 +0200 Subject: [PATCH 2/3] [I18N] base_phone: Incorrect translations --- base_phone/i18n/de.po | 5 ++--- base_phone/i18n/sl.po | 5 ++--- base_phone/i18n/tr.po | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/base_phone/i18n/de.po b/base_phone/i18n/de.po index 63d7158b5..a7b2f3b37 100644 --- a/base_phone/i18n/de.po +++ b/base_phone/i18n/de.po @@ -45,7 +45,7 @@ msgstr "Click2dial erfolgreich" #: code:addons/base_phone/static/src/js/phone_widget.js:0 #, fuzzy, python-format msgid "Click2dial to %s" -msgstr "Click2dial gestartet" +msgstr "Click2dial %s" #. module: base_phone #: model_terms:ir.ui.view,arch_db:base_phone.number_not_found_form @@ -232,9 +232,8 @@ msgstr "Nummer in internationales Format umgewandelt:" #. module: base_phone #. openerp-web #: code:addons/base_phone/static/src/js/phone_widget.js:0 -#, fuzzy, python-format msgid "Number dialed: %s" -msgstr "Gewählte Nummer:" +msgstr "Gewählte Nummer: %s" #. module: base_phone #: model:ir.model,name:base_phone.model_number_not_found diff --git a/base_phone/i18n/sl.po b/base_phone/i18n/sl.po index 83a9fb50e..9d580e91f 100644 --- a/base_phone/i18n/sl.po +++ b/base_phone/i18n/sl.po @@ -47,7 +47,7 @@ msgstr "Click2dial uspešen" #: code:addons/base_phone/static/src/js/phone_widget.js:0 #, fuzzy, python-format msgid "Click2dial to %s" -msgstr "Click2dial zagnan" +msgstr "Click2dial %s" #. module: base_phone #: model_terms:ir.ui.view,arch_db:base_phone.number_not_found_form @@ -228,9 +228,8 @@ msgstr "Številka pretvorjena v mednarodni format:" #. module: base_phone #. openerp-web #: code:addons/base_phone/static/src/js/phone_widget.js:0 -#, fuzzy, python-format msgid "Number dialed: %s" -msgstr "Klicana številka:" +msgstr "Klicana številka: %s" #. module: base_phone #: model:ir.model,name:base_phone.model_number_not_found diff --git a/base_phone/i18n/tr.po b/base_phone/i18n/tr.po index 4f64a67d1..823b23521 100644 --- a/base_phone/i18n/tr.po +++ b/base_phone/i18n/tr.po @@ -46,7 +46,7 @@ msgstr "Tıkla çevir başarılı" #: code:addons/base_phone/static/src/js/phone_widget.js:0 #, fuzzy, python-format msgid "Click2dial to %s" -msgstr "Tıkla çevir başlatıldı" +msgstr "Tıkla çevir başlatıldı %s" #. module: base_phone #: model_terms:ir.ui.view,arch_db:base_phone.number_not_found_form @@ -227,9 +227,8 @@ msgstr "Uluslarası biçime çevrilen numara:" #. module: base_phone #. openerp-web #: code:addons/base_phone/static/src/js/phone_widget.js:0 -#, fuzzy, python-format msgid "Number dialed: %s" -msgstr "Aranan numara:" +msgstr "Aranan numara: %s" #. module: base_phone #: model:ir.model,name:base_phone.model_number_not_found From 8f1a1ee58fcde651c0516875200cadcffc322814 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Thu, 2 May 2024 16:36:33 +0200 Subject: [PATCH 3/3] [FIX] GH workflow --- .github/workflows/pre-commit.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 9d085e5aa..602ecbca2 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -13,17 +13,10 @@ jobs: pre-commit: runs-on: ubuntu-22.04 steps: -<<<<<<< before updating - - uses: actions/checkout@v2 - - uses: actions/setup-python@v4 - with: - python-version: "3.10" -======= - uses: actions/checkout@v3 - uses: actions/setup-python@v2 with: python-version: "3.11" ->>>>>>> after updating - name: Get python version run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV - uses: actions/cache@v1