Skip to content

Commit 627975b

Browse files
authored
Merge pull request #491 from camptocamp/16.0-fix-session_redis
[16.0][FIX] session_redis: add incompatibility to auth_session_timeout
2 parents d3e2bdc + da0897b commit 627975b

File tree

5 files changed

+12
-2
lines changed

5 files changed

+12
-2
lines changed

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- uses: actions/setup-python@v2
1818
- name: Get python version
1919
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
20-
- uses: actions/cache@v1
20+
- uses: actions/cache@v4
2121
with:
2222
path: ~/.cache/pre-commit
2323
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}

.pre-commit-config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ exclude: |
66
^base_fileurl_field/|
77
^cloud_platform_exoscale/|
88
^cloud_platform_ovh/|
9-
^monitoring_log_requests/|
109
^monitoring_statsd/|
1110
^test_base_fileurl_field/|
1211
# END NOT INSTALLABLE ADDONS

session_redis/__manifest__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
"license": "AGPL-3",
1111
"category": "Extra Tools",
1212
"depends": ["base"],
13+
"excludes": [
14+
# OCA/server-auth
15+
"auth_session_timeout",
16+
],
1317
"external_dependencies": {
1418
"python": ["redis"],
1519
},
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../monitoring_log_requests
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import setuptools
2+
3+
setuptools.setup(
4+
setup_requires=['setuptools-odoo'],
5+
odoo_addon=True,
6+
)

0 commit comments

Comments
 (0)