Enable isort

inducer · inducer · commit 3615ce429215 · 2023-01-08T21:19:19.000-06:00
diff --git a/pytools/__init__.py b/pytools/__init__.py
@@ -27,23 +27,22 @@
 THE SOFTWARE.
 """
 
-import re
-from functools import reduce, wraps
-import operator
-import sys
-import logging
-from typing import (
-        Any, Callable, Dict, Generic, Hashable, Iterable,
-        List, Optional, Set, Tuple, TypeVar, Union, ClassVar)
 import builtins
-
+import logging
 import math
+import operator
+import re
+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)
+
 
 try:
-    from typing import SupportsIndex, Concatenate
+    from typing import Concatenate, SupportsIndex
 except ImportError:
-    from typing_extensions import SupportsIndex, Concatenate
+    from typing_extensions import Concatenate, SupportsIndex
 
 try:
     from typing import ParamSpec
@@ -1584,6 +1583,8 @@ def get_write_to_map_from_permutation(original, permuted):
 # {{{ graph algorithms
 
 from pytools.graph import a_star as a_star_moved
+
+
 a_star = MovedFunctionDeprecationWrapper(a_star_moved)
 
 # }}}
@@ -1871,7 +1872,7 @@ def string_histogram(  # pylint: disable=too-many-arguments,too-many-locals
                 print(value, bin_nr, bin_starts)
                 raise
 
-    from math import floor, ceil
+    from math import ceil, floor
     if use_unicode:
         def format_bar(cnt):
             scaled = cnt*width/max_count
@@ -2169,7 +2170,7 @@ def assert_not_a_file(name):
 
 
 def add_python_path_relative_to_script(rel_path):
-    from os.path import dirname, join, abspath
+    from os.path import abspath, dirname, join
 
     script_name = sys.argv[0]
     rel_script_dir = dirname(script_name)
@@ -2391,8 +2392,9 @@ def download_from_web_if_not_present(url, local_name=None):
         local_name = basename(url)
 
     if not exists(local_name):
-        from pytools.version import VERSION_TEXT
         from urllib.request import Request, urlopen
+
+        from pytools.version import VERSION_TEXT
         req = Request(url, headers={
             "User-Agent": f"pytools/{VERSION_TEXT}"
             })
@@ -2412,7 +2414,7 @@ def find_git_revision(tree_root):  # pylint: disable=too-many-locals
     # Keep this routine self-contained so that it can be copy-pasted into
     # setup.py.
 
-    from os.path import join, exists, abspath
+    from os.path import abspath, exists, join
     tree_root = abspath(tree_root)
 
     if not exists(join(tree_root, ".git")):
@@ -2432,7 +2434,7 @@ def find_git_revision(tree_root):  # pylint: disable=too-many-locals
     env["LANG"] = "C"
     env["LC_ALL"] = "C"
 
-    from subprocess import Popen, PIPE, STDOUT
+    from subprocess import PIPE, STDOUT, Popen
     p = Popen(["git", "rev-parse", "HEAD"], shell=False,
               stdin=PIPE, stdout=PIPE, stderr=STDOUT, close_fds=True,
               cwd=tree_root, env=env)
@@ -2808,8 +2810,8 @@ def unordered_hash(hash_instance, iterable, hash_constructor=None):
     """
 
     if hash_constructor is None:
-        from functools import partial
         import hashlib
+        from functools import partial
         hash_constructor = partial(hashlib.new, hash_instance.name)
 
     h_int = 0
diff --git a/pytools/batchjob.py b/pytools/batchjob.py
@@ -120,7 +120,7 @@ def submit(self, env=(("LD_LIBRARY_PATH", INHERIT), ("PYTHONPATH", INHERIT)),
 
 
 def guess_job_class():
-    from subprocess import Popen, PIPE, STDOUT
+    from subprocess import PIPE, STDOUT, Popen
     qstat_helplines = Popen(["qstat", "--help"],
             stdout=PIPE, stderr=STDOUT).communicate()[0].split("\n")
     if qstat_helplines[0].startswith("GE"):
diff --git a/pytools/convergence.py b/pytools/convergence.py
@@ -1,7 +1,7 @@
+import numbers
 from typing import List, Optional, Tuple
 
 import numpy as np
-import numbers
 
 
 # {{{ eoc estimation --------------------------------------------------------------
diff --git a/pytools/debug.py b/pytools/debug.py
@@ -11,8 +11,8 @@ def make_unique_filesystem_object(stem, extension="", directory="",
     :param extension: needs a leading dot.
     :param directory: must not have a trailing slash.
     """
-    from os.path import join
     import os
+    from os.path import join
 
     if creator is None:
         def default_creator(name):
diff --git a/pytools/graph.py b/pytools/graph.py
@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+
 __copyright__ = """
 Copyright (C) 2009-2013 Andreas Kloeckner
 Copyright (C) 2020 Matt Wala
@@ -63,9 +64,9 @@
     is included as a key in the graph.
 """
 
-from typing import (Collection, Mapping, List, Optional, Any,
-                    Callable, Set, MutableSet, Dict, Iterator, Tuple,
-                    Hashable, TypeVar)
+from typing import (Any, Callable, Collection, Dict, Hashable, Iterator, List,
+                    Mapping, MutableSet, Optional, Set, Tuple, TypeVar)
+
 
 try:
     from typing import TypeAlias
diff --git a/pytools/graphviz.py b/pytools/graphviz.py
@@ -31,10 +31,11 @@
 .. autofunction:: show_dot
 """
 
-from typing import Optional
-
 import html
 import logging
+from typing import Optional
+
+
 logger = logging.getLogger(__name__)
 
 
@@ -76,8 +77,8 @@ def show_dot(dot_code: str, output_to: Optional[str] = None) -> Optional[str]:
         generated SVG file, otherwise returns ``None``.
     """
 
-    from tempfile import mkdtemp
     import subprocess
+    from tempfile import mkdtemp
     temp_dir = mkdtemp(prefix="tmp_pytools_dot")
 
     dot_file_name = "code.dot"
diff --git a/pytools/log.py b/pytools/log.py
@@ -1,5 +1,6 @@
 from warnings import warn
 
+
 warn("pytools.log was moved to https://github.com/illinois-ceesd/logpyle/. "
         "I will try to import that for you. If the import fails, say "
         "'pip install logpyle', and change your imports from 'pytools.log' "
diff --git a/pytools/mpi.py b/pytools/mpi.py
@@ -32,8 +32,8 @@
 .. autofunction:: pytest_raises_on_rank
 """
 
-from contextlib import contextmanager, AbstractContextManager
-from typing import Generator, Tuple, Union, Type
+from contextlib import AbstractContextManager, contextmanager
+from typing import Generator, Tuple, Type, Union
 
 
 def check_for_mpi_relaunch(argv):
@@ -52,8 +52,8 @@ def run_with_mpi_ranks(py_script, ranks, callable_, args=(), kwargs=None):
     if kwargs is None:
         kwargs = {}
 
-    import sys
     import os
+    import sys
     newenv = os.environ.copy()
     newenv["PYTOOLS_RUN_WITHIN_MPI"] = "1"
 
@@ -74,9 +74,10 @@ def pytest_raises_on_rank(my_rank: int, fail_rank: int,
     """
     Like :func:`pytest.raises`, but only expect an exception on rank *fail_rank*.
     """
-    import pytest
     from contextlib import nullcontext
 
+    import pytest
+
     if my_rank == fail_rank:
         cm: AbstractContextManager = pytest.raises(expected_exception)
     else:
diff --git a/pytools/mpiwrap.py b/pytools/mpiwrap.py
@@ -1,11 +1,15 @@
 """See pytools.prefork for this module's reason for being."""
 
 import mpi4py.rc  # pylint:disable=import-error
+
+
 mpi4py.rc.initialize = False
 
 from mpi4py.MPI import *  # noqa pylint:disable=wildcard-import,wrong-import-position
 
 import pytools.prefork  # pylint:disable=wrong-import-position
+
+
 pytools.prefork.enable_prefork()
 
 
diff --git a/pytools/obj_array.py b/pytools/obj_array.py
@@ -20,10 +20,11 @@
 THE SOFTWARE.
 """
 
-import numpy as np
 from functools import partial, update_wrapper
 from warnings import warn
 
+import numpy as np
+
 
 __doc__ = """
 Handling :mod:`numpy` Object Arrays
diff --git a/pytools/persistent_dict.py b/pytools/persistent_dict.py
@@ -26,22 +26,24 @@
 THE SOFTWARE.
 """
 
-from enum import Enum
-import logging
-import hashlib
 import collections.abc as abc
-from dataclasses import is_dataclass, fields
+import hashlib
+import logging
+from dataclasses import fields, is_dataclass
+from enum import Enum
+
 
 # Removing this in 2020-12 broke a shocking amount of stuff, such as
 # https://github.com/OP2/PyOP2/pull/605
 # Bring it back for now to mitigate the breakage, however this is going
 # away in 2021 at the latest.
 new_hash = hashlib.sha256
 
+import errno
 import os
 import shutil
 import sys
-import errno
+
 
 logger = logging.getLogger(__name__)
 
@@ -533,12 +535,13 @@ def _read(path):
 
     @staticmethod
     def _write(path, value):
-        from pickle import dump, HIGHEST_PROTOCOL
+        from pickle import HIGHEST_PROTOCOL, dump
         with open(path, "wb") as outf:
             dump(value, outf, protocol=HIGHEST_PROTOCOL)
 
     def _item_dir(self, hexdigest_key):
         from os.path import join
+
         # Some file systems limit the number of directories in a directory.
         # For ext4, that limit appears to be 64K for example.
         # This doesn't solve that problem, but it makes it much less likely
diff --git a/pytools/prefork.py b/pytools/prefork.py
@@ -40,7 +40,7 @@ def call_async(self, cmdline, cwd=None):
 
     @staticmethod
     def call_capture_output(cmdline, cwd=None, error_on_nonzero=True):
-        from subprocess import Popen, PIPE
+        from subprocess import PIPE, Popen
 
         try:
             popen = Popen(cmdline, cwd=cwd, stdin=PIPE, stdout=PIPE,
@@ -73,8 +73,8 @@ def waitall(self):
 
 
 def _send_packet(sock, data):
-    from struct import pack
     from pickle import dumps
+    from struct import pack
 
     packet = dumps(data)
 
diff --git a/pytools/py_codegen.py b/pytools/py_codegen.py
@@ -21,15 +21,13 @@
 """
 
 import marshal
+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 importlib.util import MAGIC_NUMBER as BYTECODE_VERSION
-
-
 class PythonCodeGenerator(CodeGeneratorBase):
     def get_module(self, name=None):
         if name is None:
diff --git a/pytools/spatial_btree.py b/pytools/spatial_btree.py
@@ -152,8 +152,8 @@ def visualize(self, file):
                 i.visualize(file)
 
     def plot(self, **kwargs):
-        import matplotlib.pyplot as pt
         import matplotlib.patches as mpatches
+        import matplotlib.pyplot as pt
         from matplotlib.path import Path
 
         el = self.bottom_left
diff --git a/pytools/stopwatch.py b/pytools/stopwatch.py
@@ -1,4 +1,5 @@
 import time
+
 import pytools
 
 
diff --git a/pytools/tag.py b/pytools/tag.py
@@ -30,8 +30,9 @@
 
 import sys
 from dataclasses import dataclass
-from typing import (Tuple, Set, Any, FrozenSet, Union, Iterable,  # noqa: F401
-                    TypeVar, Type)
+from typing import (Any, FrozenSet, Iterable, Set, Tuple, Type,  # noqa: F401
+                    TypeVar, Union)
+
 from pytools import memoize, memoize_method
 
 
@@ -138,6 +139,7 @@ def update_persistent_hash(self, key_hash, key_builder):
                 (self.__class__.__module__, self.__class__.__qualname__))
 
         from dataclasses import fields
+
         # Fields are ordered consistently, so ordered hashing is OK.
         #
         # No need to dispatch to superclass: fields() automatically gives us
diff --git a/setup.cfg b/setup.cfg
@@ -7,6 +7,10 @@ docstring-quotes = "
 multiline-quotes = """
 
 # enable-flake8-bugbear
+# enable-isort
+
+[isort]
+lines_after_imports = 2
 
 [wheel]
 universal = 1
diff --git a/test/test_graph_tools.py b/test/test_graph_tools.py
diff --git a/test/test_persistent_dict.py b/test/test_persistent_dict.py
diff --git a/test/test_pytools.py b/test/test_pytools.py
