diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000000..578a0acce6ba
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+requirements.txt merge=union
diff --git a/.isort.cfg b/.isort.cfg
index 98b216f744db..63b73ca6b632 100644
--- a/.isort.cfg
+++ b/.isort.cfg
@@ -9,4 +9,3 @@ line_length=88
 known_odoo=odoo
 known_odoo_addons=odoo.addons
 sections=FUTURE,STDLIB,THIRDPARTY,ODOO,ODOO_ADDONS,FIRSTPARTY,LOCALFOLDER
-known_third_party=setuptools
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 876d1e98ee50..3b690c1c7bd1 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -51,16 +51,14 @@ repos:
   rev: v1.24.0
   hooks:
   - id: pyupgrade
-- repo: https://github.com/asottile/seed-isort-config
-  rev: v1.9.3
-  hooks:
-  - id: seed-isort-config
-- repo: https://github.com/pre-commit/mirrors-isort
-  rev: v4.3.21
+- repo: https://github.com/timothycrosley/isort
+  rev: 4.3.21-2
   hooks:
   - id: isort
     name: isort except __init__.py
+    'types': [python]
     exclude: /__init__\.py$
+    additional_dependencies: [pipreqs, pip-api]
 - repo: https://github.com/pre-commit/mirrors-eslint
   rev: v6.5.1
   hooks:
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 000000000000..e69de29bb2d1