Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[14.0] dotfiles update needs manual intervention #321

Merged
merged 3 commits into from
May 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -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: {}
Expand All @@ -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
Expand All @@ -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

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: 12 additions & 3 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +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.10"
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 @@ -27,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
4 changes: 2 additions & 2 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 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.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
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 All @@ -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' }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ __pycache__/
*.py[cod]
/.venv
/.pytest_cache
/.ruff_cache

# C extensions
*.so
Expand Down
2 changes: 2 additions & 0 deletions .oca_hooks.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[MESSAGES_CONTROL]
disable=xml-deprecated-data-node,xml-deprecated-tree-attribute
21 changes: 20 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
5 changes: 2 additions & 3 deletions base_phone/i18n/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions base_phone/i18n/sl.po
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions base_phone/i18n/tr.po
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading