From a79b89a91f64d8595add5fa6a8deefc7647c4d5d Mon Sep 17 00:00:00 2001 From: sami jaghouar Date: Fri, 15 Oct 2021 11:44:08 +0200 Subject: [PATCH] update conflicting isort and black config see https://github.com/PyCQA/isort/issues/1518 --- .isort.cfg | 3 +++ .pre-commit-config.yaml | 11 ++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.isort.cfg b/.isort.cfg index 5ff65a2..8fa8bbf 100644 --- a/.isort.cfg +++ b/.isort.cfg @@ -1,2 +1,5 @@ [settings] known_third_party = PIL,einops,matplotlib,numpy,pytest,pytorch_lightning,torch,torchmetrics,torchvision + +[tool.isort] +profile = "black" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6d694cd..e994b20 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,12 +1,9 @@ repos: -- repo: https://github.com/asottile/seed-isort-config - rev: v2.2.0 +- repo: https://github.com/pycqa/isort + rev: 5.5.4 hooks: - - id: seed-isort-config -- repo: https://github.com/pre-commit/mirrors-isort - rev: v5.9.1 - hooks: - - id: isort + - id: isort + args: ["--profile", "black"] - repo: https://github.com/ambv/black rev: 21.6b0 hooks: