From a52c3df0481b5f2ceea6aa25576a480c6287edb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= <stephane.bidoul@acsone.eu>
Date: Mon, 9 Jan 2023 14:59:39 +0100
Subject: [PATCH 1/2] Update dotfiles

---
 .copier-answers.yml              | 11 +++++++++--
 .github/workflows/pre-commit.yml |  2 +-
 .github/workflows/test.yml       |  2 +-
 .gitignore                       |  1 -
 .pre-commit-config.yaml          | 15 +++++++++++++--
 .pylintrc                        |  2 ++
 .pylintrc-mandatory              |  1 +
 7 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/.copier-answers.yml b/.copier-answers.yml
index b754cae54..f2c5c2ba6 100644
--- a/.copier-answers.yml
+++ b/.copier-answers.yml
@@ -1,18 +1,25 @@
 # Do NOT update manually; changes here will be overwritten by Copier
-_commit: v1.6.1
+_commit: v1.14.0
 _src_path: https://github.com/OCA/oca-addons-repo-template.git
 ci: GitHub
 dependency_installation_mode: PIP
 generate_requirements_txt: true
+github_check_license: true
+github_ci_extra_env: {}
+github_enable_codecov: true
+github_enable_makepot: true
+github_enable_stale_action: true
+github_enforce_dev_status_compatibility: true
 include_wkhtmltopdf: false
 odoo_version: 13.0
 org_name: Odoo Community Association (OCA)
 org_slug: OCA
 rebel_module_groups: []
 repo_description: This project aims to deal with modules related to the webclient
-  of Odoo.
+    of Odoo.
 repo_name: Web addons for Odoo
 repo_slug: web
 repo_website: https://github.com/OCA/web
 travis_apt_packages: []
 travis_apt_sources: []
+
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index aafa13887..0083b5c1b 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.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
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e7364499e..112858db4 100644
--- a/.github/workflows/test.yml
+++ b/.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:
diff --git a/.gitignore b/.gitignore
index 818770fb1..9c283fd41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,6 @@ build/
 develop-eggs/
 dist/
 eggs/
-lib/
 lib64/
 parts/
 sdist/
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 40df32e1e..7d357e67f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -27,6 +27,11 @@ repos:
         entry: found forbidden files; remove them
         language: fail
         files: "\\.rej$"
+      - id: en-po-files
+        name: en.po files cannot exist
+        entry: found a en.po file
+        language: fail
+        files: '[a-zA-Z0-9_]*/i18n/en\.po$'
   - repo: https://github.com/oca/maintainer-tools
     rev: ab1d7f6
     hooks:
@@ -102,10 +107,16 @@ repos:
         name: isort except __init__.py
         exclude: /__init__\.py$
   - repo: https://github.com/acsone/setuptools-odoo
-    rev: 2.5.2
+    rev: 3.1.8
     hooks:
       - id: setuptools-odoo-make-default
-  - repo: https://gitlab.com/pycqa/flake8
+      - id: setuptools-odoo-get-requirements
+        args:
+          - --output
+          - requirements.txt
+          - --header
+          - "# generated from manifests external_dependencies"
+  - repo: https://github.com/PyCQA/flake8
     rev: 3.7.9
     hooks:
       - id: flake8
diff --git a/.pylintrc b/.pylintrc
index c3d75e12d..20d850dfe 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -1,3 +1,5 @@
+
+
 [MASTER]
 load-plugins=pylint_odoo
 score=n
diff --git a/.pylintrc-mandatory b/.pylintrc-mandatory
index 3e19630b6..1c8f3771f 100644
--- a/.pylintrc-mandatory
+++ b/.pylintrc-mandatory
@@ -1,3 +1,4 @@
+
 [MASTER]
 load-plugins=pylint_odoo
 score=n

From 0de495bcb48039c3a285c27e279cde6e458d22c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= <stephane.bidoul@acsone.eu>
Date: Mon, 9 Jan 2023 17:44:26 +0100
Subject: [PATCH 2/2] Preserve requirements.txt

Such kind of hard pins should be avoided, but I'll leave that to
maintainers of web_widget_mpld3.
---
 requirements.txt                      |  3 +--
 setup/web_widget_mpld3_chart/setup.py | 12 +++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 2158c25ed..8624dea49 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,5 @@
-# web_widget_bokeh_chart
+# generated from manifests external_dependencies
 bokeh==1.1.0
-# web_widget_mpld3_chart
 matplotlib==3.0.3; python_version < '3.7'
 matplotlib==3.4.1; python_version >= '3.7'
 mpld3==0.3
diff --git a/setup/web_widget_mpld3_chart/setup.py b/setup/web_widget_mpld3_chart/setup.py
index 28c57bb64..3a81c3b34 100644
--- a/setup/web_widget_mpld3_chart/setup.py
+++ b/setup/web_widget_mpld3_chart/setup.py
@@ -2,5 +2,15 @@ import setuptools
 
 setuptools.setup(
     setup_requires=['setuptools-odoo'],
-    odoo_addon=True,
+    odoo_addon={
+        "external_dependencies_override": {
+            "python": {
+                "mpld3": [
+                    "matplotlib==3.0.3; python_version < '3.7'",
+                    "matplotlib==3.4.1; python_version >= '3.7'",
+                    "mpld3==0.3",
+                ],
+            },
+        },
+    },
 )