Skip to content

Commit 54a33e9

Browse files
committed
Merge PR #897 into 18.0
Signed-off-by sbidoul
2 parents fc27e7e + 452bd61 commit 54a33e9

File tree

8 files changed

+303
-257
lines changed

8 files changed

+303
-257
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.35
2+
_commit: v1.38
33
_src_path: git+https://github.com/OCA/oca-addons-repo-template
44
additional_ruff_rules: []
55
ci: GitHub

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
- uses: actions/setup-python@v5
1818
with:
1919
python-version: "3.11"
20+
cache: 'pip'
2021
- name: Get python version
2122
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
2223
- uses: actions/cache@v4

.github/workflows/test.yml

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

.pylintrc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -99,22 +99,22 @@ enable=anomalous-backslash-in-string,
9999
translation-positional-used,
100100
website-manifest-key-not-valid-uri,
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,
115-
redefined-builtin,
116-
too-complex,
117110
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,
117+
redefined-builtin,
118118
manifest-external-assets
119119

120120

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

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

10-
# server-auth
11-
1213
server-auth
1314

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

auth_jwt/tests/test_auth_jwt.py

Lines changed: 279 additions & 243 deletions
Large diffs are not rendered by default.

auth_jwt_demo/demo/auth_jwt_validator.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<field name="issuer">theissuer</field>
66
<field name="signature_type">secret</field>
77
<field name="secret_algorithm">HS256</field>
8-
<field name="secret_key">thesecret</field>
8+
<field name="secret_key">thesecret 012345678901234567890123456789</field>
99
<field name="user_id_strategy">static</field>
1010
<field name="static_user_id" ref="base.user_demo" />
1111
<field name="partner_id_strategy">email</field>
@@ -17,7 +17,7 @@
1717
<field name="issuer">theissuer</field>
1818
<field name="signature_type">secret</field>
1919
<field name="secret_algorithm">HS256</field>
20-
<field name="secret_key">thesecret</field>
20+
<field name="secret_key">thesecret 012345678901234567890123456789</field>
2121
<field name="user_id_strategy">static</field>
2222
<field name="static_user_id" ref="base.user_demo" />
2323
<field name="partner_id_strategy">email</field>

checklog-odoo.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
[checklog-odoo]
22
ignore=
33
WARNING.* 0 failed, 0 error\(s\).*
4+
WARNING.* Missing widget: res_partner_many2one for field of type many2one.*

0 commit comments

Comments
 (0)