Skip to content

Commit 2b84d59

Browse files
committed
Merge PR #3531 into 16.0
Signed-off-by LoisRForgeFlow
2 parents 439ae7a + a2ad9e0 commit 2b84d59

File tree

8 files changed

+77
-64
lines changed

8 files changed

+77
-64
lines changed

.copier-answers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Do NOT update manually; changes here will be overwritten by Copier
2-
_commit: v1.29
2+
_commit: v1.39
33
_src_path: gh:oca/oca-addons-repo-template
44
ci: GitHub
55
convert_readme_fragments_to_markdown: false

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
test-requirements.txt merge=union

.github/workflows/pre-commit.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ jobs:
1717
- uses: actions/setup-python@v5
1818
with:
1919
python-version: "3.11"
20+
cache: 'pip'
21+
cache-dependency-path: '.pre-commit-config.yaml'
2022
- name: Get python version
2123
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
2224
- uses: actions/cache@v4

.github/workflows/test.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,13 @@ jobs:
7575
run: oca_init_test_database
7676
- name: Run tests
7777
run: oca_run_tests
78+
- name: Upload screenshots from JS tests
79+
uses: actions/upload-artifact@v4
80+
if: ${{ failure() }}
81+
with:
82+
name: Screenshots of failed JS tests - ${{ matrix.name }}${{ join(matrix.include) }}
83+
path: /tmp/odoo_tests/${{ env.PGDATABASE }}
84+
if-no-files-found: ignore
7885
- uses: codecov/codecov-action@v4
7986
with:
8087
token: ${{ secrets.CODECOV_TOKEN }}

.pre-commit-config.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ repos:
3939
language: fail
4040
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
4141
- repo: https://github.com/oca/maintainer-tools
42-
rev: d5fab7ee87fceee858a3d01048c78a548974d935
42+
rev: f9b919b9868143135a9c9cb03021089cabba8223
4343
hooks:
4444
# update the NOT INSTALLABLE ADDONS section above
4545
- id: oca-update-pre-commit-excluded-addons
@@ -104,6 +104,7 @@ repos:
104104
additional_dependencies:
105105
- "eslint@8.24.0"
106106
- "eslint-plugin-jsdoc@"
107+
- "globals@"
107108
- repo: https://github.com/pre-commit/pre-commit-hooks
108109
rev: v4.3.0
109110
hooks:
@@ -140,7 +141,7 @@ repos:
140141
- --settings=.
141142
exclude: /__init__\.py$
142143
- repo: https://github.com/acsone/setuptools-odoo
143-
rev: 3.1.8
144+
rev: 3.3.2
144145
hooks:
145146
- id: setuptools-odoo-make-default
146147
- id: setuptools-odoo-get-requirements

.pylintrc

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,25 @@ disable=all
2525
enable=anomalous-backslash-in-string,
2626
api-one-deprecated,
2727
api-one-multi-together,
28-
assignment-from-none,
29-
attribute-deprecated,
3028
class-camelcase,
31-
dangerous-default-value,
3229
dangerous-view-replace-wo-priority,
33-
development-status-allowed,
3430
duplicate-id-csv,
35-
duplicate-key,
3631
duplicate-xml-fields,
3732
duplicate-xml-record-id,
3833
eval-referenced,
39-
eval-used,
4034
incoherent-interpreter-exec-perm,
35+
openerp-exception-warning,
36+
redundant-modulename-xml,
37+
relative-import,
38+
rst-syntax-error,
39+
wrong-tabs-instead-of-spaces,
40+
xml-syntax-error,
41+
assignment-from-none,
42+
attribute-deprecated,
43+
dangerous-default-value,
44+
development-status-allowed,
45+
duplicate-key,
46+
eval-used,
4147
license-allowed,
4248
manifest-author-string,
4349
manifest-deprecated-key,
@@ -48,73 +54,68 @@ enable=anomalous-backslash-in-string,
4854
method-inverse,
4955
method-required-super,
5056
method-search,
51-
openerp-exception-warning,
5257
pointless-statement,
5358
pointless-string-statement,
5459
print-used,
5560
redundant-keyword-arg,
56-
redundant-modulename-xml,
5761
reimported,
58-
relative-import,
5962
return-in-init,
60-
rst-syntax-error,
6163
sql-injection,
6264
too-few-format-args,
6365
translation-field,
6466
translation-required,
6567
unreachable,
6668
use-vim-comment,
67-
wrong-tabs-instead-of-spaces,
68-
xml-syntax-error,
69-
attribute-string-redundant,
7069
character-not-valid-in-resource-link,
71-
consider-merging-classes-inherited,
72-
context-overridden,
7370
create-user-wo-reset-password,
7471
dangerous-filter-wo-user,
7572
dangerous-qweb-replace-wo-priority,
7673
deprecated-data-xml-node,
7774
deprecated-openerp-xml-node,
7875
duplicate-po-message-definition,
79-
except-pass,
8076
file-not-used,
77+
missing-newline-extrafiles,
78+
old-api7-method-defined,
79+
po-msgstr-variables,
80+
po-syntax-error,
81+
str-format-used,
82+
unnecessary-utf8-coding-comment,
83+
xml-attribute-translatable,
84+
xml-deprecated-qweb-directive,
85+
xml-deprecated-tree-attribute,
86+
attribute-string-redundant,
87+
consider-merging-classes-inherited,
88+
context-overridden,
89+
except-pass,
8190
invalid-commit,
8291
manifest-maintainers-list,
83-
missing-newline-extrafiles,
8492
missing-readme,
8593
missing-return,
8694
odoo-addons-relative-import,
87-
old-api7-method-defined,
88-
po-msgstr-variables,
89-
po-syntax-error,
9095
renamed-field-parameter,
9196
resource-not-exist,
92-
str-format-used,
9397
test-folder-imported,
9498
translation-contains-variable,
9599
translation-positional-used,
96-
unnecessary-utf8-coding-comment,
97100
website-manifest-key-not-valid-uri,
98-
xml-attribute-translatable,
99-
xml-deprecated-qweb-directive,
100-
xml-deprecated-tree-attribute,
101101
external-request-timeout,
102-
# messages that do not cause the lint step to fail
103-
consider-merging-classes-inherited,
102+
missing-manifest-dependency,
103+
too-complex,,
104104
create-user-wo-reset-password,
105105
dangerous-filter-wo-user,
106-
deprecated-module,
107106
file-not-used,
108-
invalid-commit,
109-
missing-manifest-dependency,
110107
missing-newline-extrafiles,
111-
missing-readme,
112108
no-utf8-coding-comment,
113-
odoo-addons-relative-import,
114109
old-api7-method-defined,
110+
unnecessary-utf8-coding-comment,
111+
# messages that do not cause the lint step to fail
112+
consider-merging-classes-inherited,
113+
deprecated-module,
114+
invalid-commit,
115+
missing-readme,
116+
odoo-addons-relative-import,
115117
redefined-builtin,
116-
too-complex,
117-
unnecessary-utf8-coding-comment
118+
manifest-external-assets
118119

119120

120121
[REPORTS]

.pylintrc-mandatory

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,25 @@ disable=all
1717
enable=anomalous-backslash-in-string,
1818
api-one-deprecated,
1919
api-one-multi-together,
20-
assignment-from-none,
21-
attribute-deprecated,
2220
class-camelcase,
23-
dangerous-default-value,
2421
dangerous-view-replace-wo-priority,
25-
development-status-allowed,
2622
duplicate-id-csv,
27-
duplicate-key,
2823
duplicate-xml-fields,
2924
duplicate-xml-record-id,
3025
eval-referenced,
31-
eval-used,
3226
incoherent-interpreter-exec-perm,
27+
openerp-exception-warning,
28+
redundant-modulename-xml,
29+
relative-import,
30+
rst-syntax-error,
31+
wrong-tabs-instead-of-spaces,
32+
xml-syntax-error,
33+
assignment-from-none,
34+
attribute-deprecated,
35+
dangerous-default-value,
36+
development-status-allowed,
37+
duplicate-key,
38+
eval-used,
3339
license-allowed,
3440
manifest-author-string,
3541
manifest-deprecated-key,
@@ -40,56 +46,50 @@ enable=anomalous-backslash-in-string,
4046
method-inverse,
4147
method-required-super,
4248
method-search,
43-
openerp-exception-warning,
4449
pointless-statement,
4550
pointless-string-statement,
4651
print-used,
4752
redundant-keyword-arg,
48-
redundant-modulename-xml,
4953
reimported,
50-
relative-import,
5154
return-in-init,
52-
rst-syntax-error,
5355
sql-injection,
5456
too-few-format-args,
5557
translation-field,
5658
translation-required,
5759
unreachable,
5860
use-vim-comment,
59-
wrong-tabs-instead-of-spaces,
60-
xml-syntax-error,
61-
attribute-string-redundant,
6261
character-not-valid-in-resource-link,
63-
consider-merging-classes-inherited,
64-
context-overridden,
6562
create-user-wo-reset-password,
6663
dangerous-filter-wo-user,
6764
dangerous-qweb-replace-wo-priority,
6865
deprecated-data-xml-node,
6966
deprecated-openerp-xml-node,
7067
duplicate-po-message-definition,
71-
except-pass,
7268
file-not-used,
69+
missing-newline-extrafiles,
70+
old-api7-method-defined,
71+
po-msgstr-variables,
72+
po-syntax-error,
73+
str-format-used,
74+
unnecessary-utf8-coding-comment,
75+
xml-attribute-translatable,
76+
xml-deprecated-qweb-directive,
77+
xml-deprecated-tree-attribute,
78+
attribute-string-redundant,
79+
consider-merging-classes-inherited,
80+
context-overridden,
81+
except-pass,
7382
invalid-commit,
7483
manifest-maintainers-list,
75-
missing-newline-extrafiles,
7684
missing-readme,
7785
missing-return,
7886
odoo-addons-relative-import,
79-
old-api7-method-defined,
80-
po-msgstr-variables,
81-
po-syntax-error,
8287
renamed-field-parameter,
8388
resource-not-exist,
84-
str-format-used,
8589
test-folder-imported,
8690
translation-contains-variable,
8791
translation-positional-used,
88-
unnecessary-utf8-coding-comment,
8992
website-manifest-key-not-valid-uri,
90-
xml-attribute-translatable,
91-
xml-deprecated-qweb-directive,
92-
xml-deprecated-tree-attribute,
9393
external-request-timeout
9494

9595
[REPORTS]

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11

2+
[![Support the OCA](https://odoo-community.org/readme-banner-image)](https://odoo-community.org/get-involved?utm_source=repo-readme)
3+
4+
# server-tools
25
[![Runboat](https://img.shields.io/badge/runboat-Try%20me-875A7B.png)](https://runboat.odoo-community.org/builds?repo=OCA/server-tools&target_branch=16.0)
36
[![Pre-commit Status](https://github.com/OCA/server-tools/actions/workflows/pre-commit.yml/badge.svg?branch=16.0)](https://github.com/OCA/server-tools/actions/workflows/pre-commit.yml?query=branch%3A16.0)
47
[![Build Status](https://github.com/OCA/server-tools/actions/workflows/test.yml/badge.svg?branch=16.0)](https://github.com/OCA/server-tools/actions/workflows/test.yml?query=branch%3A16.0)
@@ -7,8 +10,6 @@
710

811
<!-- /!\ do not modify above this line -->
912

10-
# server-tools
11-
1213
TODO: add repo description.
1314

1415
<!-- /!\ do not modify below this line -->

0 commit comments

Comments
 (0)