diff --git a/.copier-answers.yml b/.copier-answers.yml
index 9095feba9..3f45c59f2 100644
--- a/.copier-answers.yml
+++ b/.copier-answers.yml
@@ -1,8 +1,7 @@
# Do NOT update manually; changes here will be overwritten by Copier
-_commit: v1.14.2
+_commit: v1.17.2
_src_path: gh:oca/oca-addons-repo-template
ci: GitHub
-dependency_installation_mode: PIP
generate_requirements_txt: true
github_check_license: true
github_ci_extra_env: {}
@@ -11,6 +10,7 @@ github_enable_makepot: true
github_enable_stale_action: true
github_enforce_dev_status_compatibility: true
include_wkhtmltopdf: false
+odoo_test_flavor: Both
odoo_version: 14.0
org_name: Odoo Community Association (OCA)
org_slug: OCA
@@ -19,7 +19,4 @@ repo_description: Odoo server side authentication modules
repo_name: server-auth
repo_slug: server-auth
repo_website: https://github.com/OCA/server-auth
-travis_apt_packages:
-- xmlsec1
-travis_apt_sources: []
diff --git a/.eslintrc.yml b/.eslintrc.yml
index 9429bc688..fed88d70d 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -22,6 +22,7 @@ globals:
odoo: readonly
openerp: readonly
owl: readonly
+ luxon: readonly
# Styling is handled by Prettier, so we only need to enable AST rules;
# see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 755f8a225..602ecbca2 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -13,8 +13,10 @@ jobs:
pre-commit:
runs-on: ubuntu-22.04
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- uses: actions/setup-python@v2
+ with:
+ python-version: "3.11"
- name: Get python version
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
- uses: actions/cache@v1
@@ -25,6 +27,15 @@ jobs:
run: pip install pre-commit
- name: Run pre-commit
run: pre-commit run --all-files --show-diff-on-failure --color=always
+ env:
+ # Consider valid a PR that changes README fragments but doesn't
+ # change the README.rst file itself. It's not really a problem
+ # because the bot will update it anyway after merge. This way, we
+ # lower the barrier for functional contributors that want to fix the
+ # readme fragments, while still letting developers get README
+ # auto-generated (which also helps functionals when using runboat).
+ # DOCS https://pre-commit.com/#temporarily-disabling-hooks
+ SKIP: oca-gen-addon-readme
- name: Check that all files generated by pre-commit are in git
run: |
newfiles="$(git ls-files --others --exclude-from=.gitignore)"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 215b84b0f..326c12556 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
name: Detect unreleased dependencies
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- run: |
for reqfile in requirements.txt test-requirements.txt ; do
if [ -f ${reqfile} ] ; then
@@ -36,10 +36,10 @@ jobs:
matrix:
include:
- container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest
- makepot: "true"
name: test with Odoo
- container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest
name: test with OCB
+ makepot: "true"
services:
postgres:
image: postgres:9.6
@@ -50,7 +50,7 @@ jobs:
ports:
- 5432:5432
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
with:
persist-credentials: false
- name: Install addons and dependencies
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index c971566ae..62f4379ed 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,6 +12,8 @@ exclude: |
/static/(src/)?lib/|
# Repos using Sphinx to generate docs don't need prettying
^docs/_templates/.*\.html$|
+ # Don't bother non-technical authors with formatting issues in docs
+ readme/.*\.(rst|md)$|
# You don't usually want a bot to modify your legal texts
(LICENSE.*|COPYING.*)
default_language_version:
@@ -33,12 +35,24 @@ repos:
language: fail
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
- repo: https://github.com/oca/maintainer-tools
- rev: ab1d7f6
+ rev: 969238e47c07d0c40573acff81d170f63245d738
hooks:
# update the NOT INSTALLABLE ADDONS section above
- id: oca-update-pre-commit-excluded-addons
- id: oca-fix-manifest-website
args: ["https://github.com/OCA/server-auth"]
+ - id: oca-gen-addon-readme
+ args:
+ - --addons-dir=.
+ - --branch=14.0
+ - --org-name=OCA
+ - --repo-name=server-auth
+ - --if-source-changed
+ - repo: https://github.com/OCA/odoo-pre-commit-hooks
+ rev: v0.0.25
+ hooks:
+ - id: oca-checks-odoo-module
+ - id: oca-checks-po
- repo: https://github.com/myint/autoflake
rev: v1.4
hooks:
diff --git a/auth_jwt/i18n/auth_jwt.pot b/auth_jwt/i18n/auth_jwt.pot
index e16bbf5d6..2f3b6199e 100644
--- a/auth_jwt/i18n/auth_jwt.pot
+++ b/auth_jwt/i18n/auth_jwt.pot
@@ -342,6 +342,5 @@ msgstr ""
#. module: auth_jwt
#: model_terms:ir.ui.view,arch_db:auth_jwt.view_auth_jwt_validator_form
-#: model_terms:ir.ui.view,arch_db:auth_jwt.view_auth_jwt_validator_tree
msgid "arch"
msgstr ""
diff --git a/auth_jwt/views/auth_jwt_validator_views.xml b/auth_jwt/views/auth_jwt_validator_views.xml
index 32a6fabe0..bc907038a 100644
--- a/auth_jwt/views/auth_jwt_validator_views.xml
+++ b/auth_jwt/views/auth_jwt_validator_views.xml
@@ -78,7 +78,7 @@
auth.jwt.validator.tree
auth.jwt.validator
-
+
diff --git a/auth_user_case_insensitive/tests/test_res_users.py b/auth_user_case_insensitive/tests/test_res_users.py
index 22120a600..a093438c6 100644
--- a/auth_user_case_insensitive/tests/test_res_users.py
+++ b/auth_user_case_insensitive/tests/test_res_users.py
@@ -48,7 +48,7 @@ def test_login_login_is_lowercased(self):
"""It should verify the login is set to lowercase on login"""
rec_id = self._new_record()
# We have to commit this cursor, because `_login` uses a fresh cursor
- self.env.cr.commit()
+ self.env.cr.commit() # pylint: disable=E8102
with mute_logger("odoo.addons.auth_ldap.models.res_company_ldap"):
res_id = self.model_obj._login(
self.env.registry.db_name,