From de814cd7556de2df6f6ba184f85fe2ffcdbeb404 Mon Sep 17 00:00:00 2001 From: Michele Date: Thu, 27 Jul 2023 12:51:52 +0200 Subject: [PATCH 1/2] Update copier 1.15.0 --- .copier-answers.yml | 6 ++---- .github/workflows/pre-commit.yml | 2 +- .github/workflows/test.yml | 6 +++--- .pre-commit-config.yaml | 7 ++++++- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 6f7fba9..19ac983 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.15.0 _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: 16.0 org_name: Odoo Community Association (OCA) org_slug: OCA @@ -19,6 +19,4 @@ repo_description: 'TODO: add repo description.' repo_name: report-print-send repo_slug: report-print-send repo_website: https://github.com/OCA/report-print-send -travis_apt_packages: [] -travis_apt_sources: [] diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 23e6e58..f4f16d3 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -13,7 +13,7 @@ jobs: pre-commit: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-python@v2 - name: Get python version run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f1b2b9f..e1af743 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.10-odoo16.0:latest - makepot: "true" name: test with Odoo - container: ghcr.io/oca/oca-ci/py3.10-ocb16.0:latest name: test with OCB + makepot: "true" services: postgres: image: postgres:12.0 @@ -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 571bc9a..25afe2b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -39,6 +39,11 @@ repos: - id: oca-update-pre-commit-excluded-addons - id: oca-fix-manifest-website args: ["https://github.com/OCA/report-print-send"] + - 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.6.1 hooks: @@ -125,7 +130,7 @@ repos: name: flake8 additional_dependencies: ["flake8-bugbear==21.9.2"] - repo: https://github.com/OCA/pylint-odoo - rev: 7.0.2 + rev: v8.0.19 hooks: - id: pylint_odoo name: pylint with optional checks From 6c802db8eb8e3ddf484c0fe0a9811545ea82cc7f Mon Sep 17 00:00:00 2001 From: Michele Date: Thu, 27 Jul 2023 13:51:49 +0200 Subject: [PATCH 2/2] Fix for unexpected 'nombre' on base_report_to_printer/i18n/es.po --- base_report_to_printer/i18n/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base_report_to_printer/i18n/es.po b/base_report_to_printer/i18n/es.po index ec99b14..549433e 100644 --- a/base_report_to_printer/i18n/es.po +++ b/base_report_to_printer/i18n/es.po @@ -954,7 +954,7 @@ msgstr "Asistente" #: code:addons/base_report_to_printer/wizards/print_attachment_report.py:0 #, python-format msgid "{name} ({copies} copies)" -msgstr "{name} ({copies} copies) :{nombre} ({copias} copias)" +msgstr "{name} ({copies} copies) :{name} ({copies} copias)" #~ msgid "Users" #~ msgstr "Usuarios"