Merge pull request OCA#308 from OCA/12.0

Syncing from upstream OCA/server-auth (12.0)

Author: bt-admin

.copier-answers.yml

@@ -1,10 +1,11 @@
 # Do NOT update manually; changes here will be overwritten by Copier
-_commit: v1.11.0
+_commit: v1.14.2
 _src_path: git+https://github.com/oca/oca-addons-repo-template
 ci: GitHub
 dependency_installation_mode: PIP
 generate_requirements_txt: true
 github_check_license: false
+github_ci_extra_env: {}
 github_enable_codecov: true
 github_enable_makepot: true
 github_enable_stale_action: true

.github/workflows/pre-commit.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   pre-commit:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2

.github/workflows/test.yml

@@ -28,7 +28,7 @@ jobs:
               fi
           done
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     container: ${{ matrix.container }}
     name: ${{ matrix.name }}
     strategy:

.pre-commit-config.yaml

@@ -15,7 +15,7 @@ exclude: |
   # You don't usually want a bot to modify your legal texts
   (LICENSE.*|COPYING.*)
 default_language_version:
-  python: python3
+  python: python3.6
 repos:
   - repo: https://github.com/oca/maintainer-tools
     rev: ab1d7f6
@@ -38,7 +38,6 @@ repos:
     rev: v3.4.1
     hooks:
       - id: flake8
-        language_version: python3.6
         name: flake8 excluding __init__.py
         exclude: __init__\.py
   - repo: https://github.com/pre-commit/mirrors-pylint

.pre-commit-config.yaml.rej

@@ -0,0 +1,6 @@
+diff a/.pre-commit-config.yaml b/.pre-commit-config.yaml	(rejected hunks)
+@@ -27,3 +27,3 @@ repos:
+   - repo: https://github.com/acsone/setuptools-odoo
+-    rev: 3.0.6
++    rev: 3.1.8
+     hooks: