Merge 7c98c8b into 0d94e8b

OCA · Jan 31, 2020 · b6926c0 · b6926c0
2 parents 0d94e8b + 7c98c8b
commit b6926c0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/sample_files/pre-commit-13.0/.gitattributes b/sample_files/pre-commit-13.0/.gitattributes
@@ -0,0 +1,2 @@
+# Limit conflicts in PRs by automatically merging lines of both sides
+requirements.txt merge=union
diff --git a/sample_files/pre-commit-13.0/.isort.cfg b/sample_files/pre-commit-13.0/.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=
diff --git a/sample_files/pre-commit-13.0/.pre-commit-config.yaml b/sample_files/pre-commit-13.0/.pre-commit-config.yaml
@@ -85,13 +85,12 @@ repos:
     rev: v1.26.2
     hooks:
       - id: pyupgrade
-  - repo: https://github.com/asottile/seed-isort-config
-    rev: v1.9.4
-    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
         exclude: /__init__\.py$
+        # TODO, the next time we upgrade isort's rev, we should remove 'types'
+        types: [python]
+        additional_dependencies: ["pipreqs==0.4.10", "pip-api==0.0.13"]
diff --git a/sample_files/pre-commit-13.0/requirements.txt b/sample_files/pre-commit-13.0/requirements.txt