From 5125e26154cd7909fca692d985e92bdb9ed4bb2d Mon Sep 17 00:00:00 2001 From: Chris Adams Date: Wed, 6 Mar 2019 11:28:52 -0500 Subject: [PATCH] setup.cfg: bring isort settings in-line with Black MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The main change here is adding the option to add a trailing comma so it doesn’t get removed until Black restores it. --- setup.cfg | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/setup.cfg b/setup.cfg index 1254136a4..9daf4f4f5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,17 +4,19 @@ ignore = max-line-length = 88 [tool:pytest] -DJANGO_SETTINGS_MODULE=concordia.settings_test -addopts=-rf +DJANGO_SETTINGS_MODULE = concordia.settings_test +addopts = -rf [isort] -line_length = 88 -known_first_party = concordia,importer,exporter default_section = THIRDPARTY +force_grid_wrap = 0 +include_trailing_comma = True +known_first_party = concordia,importer,exporter +line_length = 88 +multi_line_output = 3 not_skip = __init__.py skip = .venv use_parentheses = True -multi_line_output = 3 [flake8] exclude = .venv