Skip to content

Commit 59f431e

Browse files
authored
Merge pull request #117 from OCA/14.0-ocabot-update-dotfiles
[14.0] dotfiles update needs manual intervention
2 parents ce30a7e + 07b2c4b commit 59f431e

File tree

7 files changed

+33
-21
lines changed

7 files changed

+33
-21
lines changed

.copier-answers.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# Do NOT update manually; changes here will be overwritten by Copier
2-
_commit: v1.14.2
2+
_commit: v1.17.2
33
_src_path: gh:oca/oca-addons-repo-template
44
ci: GitHub
5-
dependency_installation_mode: PIP
65
generate_requirements_txt: true
76
github_check_license: true
87
github_ci_extra_env: {}
@@ -11,6 +10,7 @@ github_enable_makepot: true
1110
github_enable_stale_action: true
1211
github_enforce_dev_status_compatibility: true
1312
include_wkhtmltopdf: false
13+
odoo_test_flavor: Both
1414
odoo_version: 14.0
1515
org_name: Odoo Community Association (OCA)
1616
org_slug: OCA
@@ -19,6 +19,4 @@ repo_description: 'TODO: add repo description.'
1919
repo_name: donation
2020
repo_slug: donation
2121
repo_website: https://github.com/OCA/donation
22-
travis_apt_packages: []
23-
travis_apt_sources: []
2422

.eslintrc.yml

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ globals:
2222
odoo: readonly
2323
openerp: readonly
2424
owl: readonly
25+
luxon: readonly
2526

2627
# Styling is handled by Prettier, so we only need to enable AST rules;
2728
# see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890

.github/workflows/pre-commit.yml

+12-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ jobs:
1313
pre-commit:
1414
runs-on: ubuntu-22.04
1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v3
1717
- uses: actions/setup-python@v2
18+
with:
19+
python-version: "3.11"
1820
- name: Get python version
1921
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
2022
- uses: actions/cache@v1
@@ -25,6 +27,15 @@ jobs:
2527
run: pip install pre-commit
2628
- name: Run pre-commit
2729
run: pre-commit run --all-files --show-diff-on-failure --color=always
30+
env:
31+
# Consider valid a PR that changes README fragments but doesn't
32+
# change the README.rst file itself. It's not really a problem
33+
# because the bot will update it anyway after merge. This way, we
34+
# lower the barrier for functional contributors that want to fix the
35+
# readme fragments, while still letting developers get README
36+
# auto-generated (which also helps functionals when using runboat).
37+
# DOCS https://pre-commit.com/#temporarily-disabling-hooks
38+
SKIP: oca-gen-addon-readme
2839
- name: Check that all files generated by pre-commit are in git
2940
run: |
3041
newfiles="$(git ls-files --others --exclude-from=.gitignore)"

.github/workflows/test.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
name: Detect unreleased dependencies
1616
steps:
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v3
1818
- run: |
1919
for reqfile in requirements.txt test-requirements.txt ; do
2020
if [ -f ${reqfile} ] ; then
@@ -36,10 +36,10 @@ jobs:
3636
matrix:
3737
include:
3838
- container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest
39-
makepot: "true"
4039
name: test with Odoo
4140
- container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest
4241
name: test with OCB
42+
makepot: "true"
4343
services:
4444
postgres:
4545
image: postgres:9.6
@@ -50,7 +50,7 @@ jobs:
5050
ports:
5151
- 5432:5432
5252
steps:
53-
- uses: actions/checkout@v2
53+
- uses: actions/checkout@v3
5454
with:
5555
persist-credentials: false
5656
- name: Install addons and dependencies

.pre-commit-config.yaml

+15-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ exclude: |
1212
/static/(src/)?lib/|
1313
# Repos using Sphinx to generate docs don't need prettying
1414
^docs/_templates/.*\.html$|
15+
# Don't bother non-technical authors with formatting issues in docs
16+
readme/.*\.(rst|md)$|
1517
# You don't usually want a bot to modify your legal texts
1618
(LICENSE.*|COPYING.*)
1719
default_language_version:
@@ -33,12 +35,24 @@ repos:
3335
language: fail
3436
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
3537
- repo: https://github.com/oca/maintainer-tools
36-
rev: ab1d7f6
38+
rev: 969238e47c07d0c40573acff81d170f63245d738
3739
hooks:
3840
# update the NOT INSTALLABLE ADDONS section above
3941
- id: oca-update-pre-commit-excluded-addons
4042
- id: oca-fix-manifest-website
4143
args: ["https://github.com/OCA/donation"]
44+
- id: oca-gen-addon-readme
45+
args:
46+
- --addons-dir=.
47+
- --branch=14.0
48+
- --org-name=OCA
49+
- --repo-name=donation
50+
- --if-source-changed
51+
- repo: https://github.com/OCA/odoo-pre-commit-hooks
52+
rev: v0.0.25
53+
hooks:
54+
- id: oca-checks-odoo-module
55+
- id: oca-checks-po
4256
- repo: https://github.com/myint/autoflake
4357
rev: v1.4
4458
hooks:

donation/i18n/donation.pot

-6
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,6 @@ msgstr ""
610610

611611
#. module: donation
612612
#: model:ir.model.fields,help:donation.field_donation_donation__message_has_error
613-
#: model:ir.model.fields,help:donation.field_donation_donation__message_has_sms_error
614613
msgid "If checked, some messages have a delivery error."
615614
msgstr ""
616615

@@ -935,11 +934,6 @@ msgstr ""
935934
msgid "Responsible User"
936935
msgstr ""
937936

938-
#. module: donation
939-
#: model:ir.model.fields,field_description:donation.field_donation_donation__message_has_sms_error
940-
msgid "SMS Delivery error"
941-
msgstr ""
942-
943937
#. module: donation
944938
#: model_terms:ir.ui.view,arch_db:donation.donation_form
945939
msgid "Save Default Values"

donation_base/i18n/donation_base.pot

-6
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,6 @@ msgstr ""
309309

310310
#. module: donation_base
311311
#: model:ir.model.fields,help:donation_base.field_donation_tax_receipt__message_has_error
312-
#: model:ir.model.fields,help:donation_base.field_donation_tax_receipt__message_has_sms_error
313312
msgid "If checked, some messages have a delivery error."
314313
msgstr ""
315314

@@ -512,11 +511,6 @@ msgstr ""
512511
msgid "Responsible User"
513512
msgstr ""
514513

515-
#. module: donation_base
516-
#: model:ir.model.fields,field_description:donation_base.field_donation_tax_receipt__message_has_sms_error
517-
msgid "SMS Delivery error"
518-
msgstr ""
519-
520514
#. module: donation_base
521515
#: model_terms:ir.ui.view,arch_db:donation_base.donation_tax_receipt_search
522516
msgid "Search Donation Tax Receipts"

0 commit comments

Comments
 (0)