Update isort configuration after discussion in boxtree

inducer/boxtree#74

Author: inducer

pytools/__init__.py

@@ -35,8 +35,9 @@
 import sys
 from functools import reduce, wraps
 from sys import intern
-from typing import (Any, Callable, ClassVar, Dict, Generic, Hashable, Iterable,
-                    List, Optional, Set, Tuple, TypeVar, Union)
+from typing import (
+    Any, Callable, ClassVar, Dict, Generic, Hashable, Iterable, List, Optional, Set,
+    Tuple, TypeVar, Union)
 
 
 try:

pytools/graph.py

@@ -64,8 +64,9 @@
     is included as a key in the graph.
 """
 
-from typing import (Any, Callable, Collection, Dict, Hashable, Iterator, List,
-                    Mapping, MutableSet, Optional, Set, Tuple, TypeVar)
+from typing import (
+    Any, Callable, Collection, Dict, Hashable, Iterator, List, Mapping, MutableSet,
+    Optional, Set, Tuple, TypeVar)
 
 
 try:

pytools/py_codegen.py

@@ -24,8 +24,8 @@
 from importlib.util import MAGIC_NUMBER as BYTECODE_VERSION
 from types import FunctionType, ModuleType
 
-from pytools.codegen import CodeGenerator as CodeGeneratorBase
-from pytools.codegen import Indentation, remove_common_indentation  # noqa
+from pytools.codegen import (  # noqa
+    CodeGenerator as CodeGeneratorBase, Indentation, remove_common_indentation)
 
 
 class PythonCodeGenerator(CodeGeneratorBase):

pytools/tag.py

@@ -30,8 +30,8 @@
 
 import sys
 from dataclasses import dataclass
-from typing import (Any, FrozenSet, Iterable, Set, Tuple, Type,  # noqa: F401
-                    TypeVar, Union)
+from typing import (  # noqa: F401
+    Any, FrozenSet, Iterable, Set, Tuple, Type, TypeVar, Union)
 
 from pytools import memoize, memoize_method
 

setup.cfg

@@ -10,7 +10,10 @@ multiline-quotes = """
 # enable-isort
 
 [isort]
+line_length = 85
 lines_after_imports = 2
+combine_as_imports = True
+multi_line_output = 4
 
 [wheel]
 universal = 1

test/test_persistent_dict.py

@@ -6,9 +6,9 @@
 
 import pytest
 
-from pytools.persistent_dict import (CollisionWarning, NoSuchEntryError,
-                                     PersistentDict, ReadOnlyEntryError,
-                                     WriteOncePersistentDict)
+from pytools.persistent_dict import (
+    CollisionWarning, NoSuchEntryError, PersistentDict, ReadOnlyEntryError,
+    WriteOncePersistentDict)
 from pytools.tag import Tag, tag_dataclass
 
 

test/test_pytools.py

@@ -494,8 +494,8 @@ def vectorized_add(self, ary):
 
 
 def test_tag():
-    from pytools.tag import (NonUniqueTagError, Tag, Taggable, UniqueTag,
-                             check_tag_uniqueness)
+    from pytools.tag import (
+        NonUniqueTagError, Tag, Taggable, UniqueTag, check_tag_uniqueness)
 
     # Need a subclass that defines the copy function in order to test.
     class TaggableWithCopy(Taggable):