Skip to content

Commit 602bb0d

Browse files
committed
Merge PR OCA#912 into 14.0
Signed-off-by guewen
2 parents 33bcad9 + c75f5d2 commit 602bb0d

File tree

8 files changed

+45
-39
lines changed

8 files changed

+45
-39
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
@@ -63,6 +63,13 @@ jobs:
6363
run: oca_init_test_database
6464
- name: Run tests
6565
run: oca_run_tests
66+
- name: Upload screenshots from JS tests
67+
uses: actions/upload-artifact@v4
68+
if: ${{ failure() }}
69+
with:
70+
name: Screenshots of failed JS tests - ${{ matrix.name }}${{ join(matrix.include) }}
71+
path: /tmp/odoo_tests/${{ env.PGDATABASE }}
72+
if-no-files-found: ignore
6673
- uses: codecov/codecov-action@v4
6774
with:
6875
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@7.8.1"
106106
- "eslint-plugin-jsdoc@"
107+
- "globals@"
107108
- repo: https://github.com/pre-commit/pre-commit-hooks
108109
rev: v3.2.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: 15 additions & 21 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,40 +54,28 @@ 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+
missing-manifest-dependency,
70+
too-complex,
6971
# messages that do not cause the lint step to fail
7072
consider-merging-classes-inherited,
71-
create-user-wo-reset-password,
72-
dangerous-filter-wo-user,
7373
deprecated-module,
74-
file-not-used,
7574
invalid-commit,
76-
missing-manifest-dependency,
77-
missing-newline-extrafiles,
7875
missing-readme,
79-
no-utf8-coding-comment,
8076
odoo-addons-relative-import,
81-
old-api7-method-defined,
8277
redefined-builtin,
83-
too-complex,
84-
unnecessary-utf8-coding-comment
78+
manifest-external-assets
8579

8680

8781
[REPORTS]

.pylintrc-mandatory

Lines changed: 13 additions & 13 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,24 +46,18 @@ 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,
58-
use-vim-comment,
59-
wrong-tabs-instead-of-spaces,
60-
xml-syntax-error
60+
use-vim-comment
6161

6262
[REPORTS]
6363
msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg}

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+
# queue
25
[![Runboat](https://img.shields.io/badge/runboat-Try%20me-875A7B.png)](https://runboat.odoo-community.org/builds?repo=OCA/queue&target_branch=14.0)
36
[![Pre-commit Status](https://github.com/OCA/queue/actions/workflows/pre-commit.yml/badge.svg?branch=14.0)](https://github.com/OCA/queue/actions/workflows/pre-commit.yml?query=branch%3A14.0)
47
[![Build Status](https://github.com/OCA/queue/actions/workflows/test.yml/badge.svg?branch=14.0)](https://github.com/OCA/queue/actions/workflows/test.yml?query=branch%3A14.0)
@@ -7,8 +10,6 @@
710

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

10-
# queue
11-
1213
Advanced async jobs management for Odoo
1314

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

0 commit comments

Comments
 (0)