Skip to content

Commit

Permalink
Merge pull request #349 from OCA/15.0-ocabot-update-dotfiles
Browse files Browse the repository at this point in the history
[15.0] dotfiles update needs manual intervention
  • Loading branch information
pedrobaeza authored Oct 28, 2023
2 parents ada4e2f + fe4ae2c commit 8d2052a
Show file tree
Hide file tree
Showing 12 changed files with 45 additions and 25 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: 'TODO: add repo description.'
repo_name: event
repo_slug: event
repo_website: https://github.com/OCA/event
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
13 changes: 12 additions & 1 deletion .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/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
18 changes: 16 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ 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:
Expand All @@ -33,12 +35,24 @@ 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/event"]
- id: oca-gen-addon-readme
args:
- --addons-dir=.
- --branch=15.0
- --org-name=OCA
- --repo-name=event
- --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
hooks:
Expand Down Expand Up @@ -125,7 +139,7 @@ repos:
name: flake8
additional_dependencies: ["flake8-bugbear==21.9.2"]
- repo: https://github.com/OCA/pylint-odoo
rev: 7.0.2
rev: 7.0.5
hooks:
- id: pylint_odoo
name: pylint with optional checks
Expand Down
4 changes: 2 additions & 2 deletions event_registration_partner_unique/i18n/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ msgstr ""
#. module: event_registration_partner_unique
#: code:addons/event_registration_partner_unique/models/event.py:0
#, python-format
msgid "Duplicated partners found in event {0}: {1}."
msgstr "Empresas duplicadas encontradas en el evento {0}: {1}."
msgid "Duplicated partners found in event %(name)s: %(partners)s."
msgstr "Empresas duplicadas encontradas en el evento %(name)s: %(partners)s."

#. module: event_registration_partner_unique
#: model:ir.model,name:event_registration_partner_unique.model_event_event
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ msgstr ""
#. module: event_registration_partner_unique
#: code:addons/event_registration_partner_unique/models/event.py:0
#, python-format
msgid "Duplicated partners found in event {0}: {1}."
msgid "Duplicated partners found in event %(name)s: %(partners)s."
msgstr ""

#. module: event_registration_partner_unique
Expand Down
4 changes: 2 additions & 2 deletions event_registration_partner_unique/i18n/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ msgstr ""
#. module: event_registration_partner_unique
#: code:addons/event_registration_partner_unique/models/event.py:0
#, python-format
msgid "Duplicated partners found in event {0}: {1}."
msgstr "Trovati partner duplicati nell'evento {0}: {1}."
msgid "Duplicated partners found in event %(name)s: %(partners)s."
msgstr "Trovati partner duplicati nell'evento %(name)s: %(partners)s."

#. module: event_registration_partner_unique
#: model:ir.model,name:event_registration_partner_unique.model_event_event
Expand Down
9 changes: 5 additions & 4 deletions event_registration_partner_unique/models/event.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,14 @@ def _check_forbid_duplicates(self):
dupes = self.search(event_reg._duplicate_search_domain())
if dupes:
raise ValidationError(
_("Duplicated partners found in event {0}: {1}.").format(
event_reg.event_id.display_name,
", ".join(
_("Duplicated partners found in event %(name)s: %(partners)s.")
% {
"name": event_reg.event_id.display_name,
"partners": ", ".join(
partner_id.display_name
for partner_id in dupes.mapped("attendee_partner_id")
),
)
}
)

def _duplicate_search_domain(self):
Expand Down
6 changes: 0 additions & 6 deletions event_session/i18n/event_session.pot
Original file line number Diff line number Diff line change
Expand Up @@ -1033,7 +1033,6 @@ msgstr ""

#. module: event_session
#: model:ir.model.fields,help:event_session.field_event_session__message_has_error
#: model:ir.model.fields,help:event_session.field_event_session__message_has_sms_error
msgid "If checked, some messages have a delivery error."
msgstr ""

Expand Down Expand Up @@ -1499,11 +1498,6 @@ msgstr ""
msgid "SEO optimized"
msgstr ""

#. module: event_session
#: model:ir.model.fields,field_description:event_session.field_event_session__message_has_sms_error
msgid "SMS Delivery error"
msgstr ""

#. module: event_session
#: model:ir.model.fields,field_description:event_session.field_event_session__sale_price_subtotal
msgid "Sales (Tax Excluded)"
Expand Down
Empty file.
1 change: 1 addition & 0 deletions website_event_snippet_calendar/templates/embed.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
name="Events Calendar and List"
inherit_id="website.layout"
primary="True"
priority="999"
>
<!-- Replace the whole page to include only the snippet -->
<xpath expr="//div[@id='wrapwrap']" position="replace">
Expand Down

0 comments on commit 8d2052a

Please sign in to comment.