diff --git a/sample_files/pre-commit-13.0/.gitattributes b/sample_files/pre-commit-13.0/.gitattributes new file mode 100644 index 000000000..13a4b8e77 --- /dev/null +++ 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 index 5751c40dd..63b73ca6b 100644 --- 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 index 3ba385896..91ed17fb3 100644 --- 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,11 @@ 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$ + 'types': [python] + additional_dependencies: [pipreqs, pip-api] diff --git a/sample_files/pre-commit-13.0/requirements.txt b/sample_files/pre-commit-13.0/requirements.txt new file mode 100644 index 000000000..0d5d1e117 --- /dev/null +++ b/sample_files/pre-commit-13.0/requirements.txt @@ -0,0 +1,2 @@ +# Add the python requirements here. +# Note: the libs in this file will be considered as "third-party libs" by isort.