From cd0a2005a788fdc0fe7c9c46a2c4de1bba545a6d Mon Sep 17 00:00:00 2001 From: David Runge Date: Mon, 18 Oct 2021 12:58:23 +0200 Subject: [PATCH] isort: Configure to use single lines pyproject.toml: Configure isort to use single lines (one line for each import) to ease merge conflicts. keyringctl: Reformat using new isort settings. --- keyringctl | 31 ++++++++++++++++++++++++------- pyproject.toml | 1 + 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/keyringctl b/keyringctl index 51e2001..2b0f6f7 100755 --- a/keyringctl +++ b/keyringctl @@ -5,15 +5,32 @@ from argparse import ArgumentParser from collections import defaultdict from contextlib import contextmanager -from logging import DEBUG, basicConfig, debug, error -from os import chdir, getcwd +from logging import DEBUG +from logging import basicConfig +from logging import debug +from logging import error +from os import chdir +from os import getcwd from pathlib import Path -from re import escape, split, sub +from re import escape +from re import split +from re import sub from shutil import copytree -from subprocess import PIPE, CalledProcessError, check_output -from sys import exit, stderr -from tempfile import TemporaryDirectory, mkdtemp -from typing import Dict, Iterable, Iterator, List, Optional, Set, Tuple, Union +from subprocess import PIPE +from subprocess import CalledProcessError +from subprocess import check_output +from sys import exit +from sys import stderr +from tempfile import TemporaryDirectory +from tempfile import mkdtemp +from typing import Dict +from typing import Iterable +from typing import Iterator +from typing import List +from typing import Optional +from typing import Set +from typing import Tuple +from typing import Union @contextmanager diff --git a/pyproject.toml b/pyproject.toml index a29dcd6..9b4c95f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,6 +33,7 @@ omit = ["tests/*", ".tox/*"] [tool.isort] profile = "black" multi_line_output = 3 +force_single_line = true [tool.mypy] ignore_missing_imports = true