Update isort version for pre-commit and update formatting

.isort.cfg

@@ -6,5 +6,4 @@
 line_length=79
 multi_line_output=3
 include_trailing_comma=true
-use_parantheses=True
 force_grid_wrap=0

.pre-commit-config.yaml

@@ -38,7 +38,7 @@ repos:
       - id: cmake-format
         exclude: build
   - repo: https://github.com/timothycrosley/isort
-    rev: 4.3.19
+    rev: 5.13.2
     hooks:
       - id: isort
         files: \.py$

doc/examples/cfg-paths.py

@@ -18,9 +18,10 @@
 #    $ ./doc/examples/cfg-paths.py /tmp/hello.gtirb
 import sys
 
-import gtirb
 import networkx as nx
 
+import gtirb
+
 if len(sys.argv) < 4:
     print(f"Usage: {sys.argv[0]} /path/to/file.gtirb source target")
     quit(1)

doc/examples/show-cfg.py

@@ -17,10 +17,11 @@
 #    $ ./doc/examples/show-cfg.py /tmp/hello.gtirb
 import sys
 
-import gtirb
 import matplotlib.pyplot as plt
 import networkx as nx
 
+import gtirb
+
 if len(sys.argv) < 2:
     print(f"Usage: {sys.argv[0]} /path/to/file.gtirb")
     quit(1)

python/gtirb/module.py

@@ -22,8 +22,8 @@
 
 if typing.TYPE_CHECKING:  # pragma: no cover
     # Ignore flake8 "imported but unused" errors.
-    from .ir import IR  # noqa: F401
     from .block import Block  # noqa: F401
+    from .ir import IR  # noqa: F401
 
 
 _T = typing.TypeVar("_T", bound=typing.Union[ProxyBlock, Section, Symbol])

python/tests/test_block.py

@@ -1,8 +1,9 @@
 import unittest
 
-import gtirb
 from helpers import create_interval_etc
 
+import gtirb
+
 
 class BlockTest(unittest.TestCase):
     def test_contains_offset(self):

python/tests/test_blocks_at.py

@@ -2,9 +2,10 @@
 
 import unittest
 
-import gtirb
 from helpers import SearchScope, create_interval_etc, parameterize_one
 
+import gtirb
+
 
 class BlocksAtTests(unittest.TestCase):
     @parameterize_one("scope", list(SearchScope))

python/tests/test_blocks_at_offset.py

@@ -2,9 +2,10 @@
 
 import unittest
 
-import gtirb
 from helpers import create_interval_etc
 
+import gtirb
+
 
 class BlocksAtOffsetTests(unittest.TestCase):
     def test_blocks_at_offset_simple(self):

python/tests/test_blocks_on.py

@@ -1,8 +1,9 @@
 import unittest
 
-import gtirb
 from helpers import SearchScope, create_interval_etc, parameterize_one
 
+import gtirb
+
 
 class BlocksOnTests(unittest.TestCase):
     @parameterize_one("scope", list(SearchScope))

python/tests/test_blocks_on_offset.py

@@ -1,8 +1,9 @@
 import unittest
 
-import gtirb
 from helpers import create_interval_etc
 
+import gtirb
+
 
 class BlocksOnOffsetTests(unittest.TestCase):
     def test_blocks_on_offset_simple(self):

python/tests/test_byte_intervals_at.py

@@ -1,8 +1,9 @@
 import unittest
 
-import gtirb
 from helpers import SearchScope, parameterize_one
 
+import gtirb
+
 
 class ByteIntervalsAtTests(unittest.TestCase):
     @parameterize_one(

python/tests/test_byte_intervals_on.py

@@ -1,8 +1,9 @@
 import unittest
 
-import gtirb
 from helpers import SearchScope, parameterize_one
 
+import gtirb
+
 
 class ByteIntervalsOnTests(unittest.TestCase):
     @parameterize_one(

python/tests/test_symbolic_expression.py

@@ -1,9 +1,10 @@
 import io
 import unittest
 
-import gtirb
 from helpers import create_interval_etc
 
+import gtirb
+
 
 class SymbolicExpressionAttributes(unittest.TestCase):
     def test_unknown_attributes(self):

python/tests/test_symbolic_expressions_at.py

@@ -1,8 +1,9 @@
 import unittest
 
-import gtirb
 from helpers import SearchScope, create_interval_etc, parameterize_one
 
+import gtirb
+
 
 class SymbolicExpressionsAtTests(unittest.TestCase):
     @parameterize_one("scope", list(SearchScope))