python: Sort import order of libraries using isort

I think it's better to stanzdarize import orders of libraries in python scripts (in tests/ and scripts/, etc) to prevent circular imports (although happens rarely), or for faster import, or for better readabilities. We can reformat import orders with isort tools, and this commit contains the result of the tool. Also, I added pyproject.toml for unified outcome. If we run isort . unnified outcome will be made. reference: https://pypi.org/project/isort/ Signed-off-by: Kang Minchul <[email protected]>
ziming-zh · Sep 29, 2021 · 2adf355 · 2adf355
1 parent 304a492
commit 2adf355
Show file tree

Hide file tree

Showing 74 changed files with 173 additions and 91 deletions.
diff --git a/misc/gen-autoargs.py b/misc/gen-autoargs.py
@@ -9,8 +9,9 @@
 #
 
 from __future__ import print_function
-import sys
+
 import re
+import sys
 
 # The syntax of C in Backus-Naur Form
 #  https://cs.wmich.edu/~gupta/teaching/cs4850/sumII06/The%20syntax%20of%20C%20in%20Backus-Naur%20form.htm

diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,8 @@
+[tool.isort]
+profile = "black"
+lines_between_types = 0
+lines_after_imports = 1
+combine_as_imports = true
+ignore_whitespace = true
+skip_gitignore = true
+
diff --git a/tests/runtest.py b/tests/runtest.py
@@ -1,11 +1,13 @@
 #!/usr/bin/env python
 
+import glob
+import multiprocessing
+import os
 import random
-import os, sys
-import tempfile
-import glob, re
+import re
 import subprocess as sp
-import multiprocessing
+import sys
+import tempfile
 import time
 
 class TestBase:

diff --git a/tests/t022_filter_kernel.py b/tests/t022_filter_kernel.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
 import os
 
+from runtest import TestBase
+
 class TestCase(TestBase):
     def __init__(self):
         TestBase.__init__(self, 'getids', serial=True, result="""

diff --git a/tests/t067_report_diff.py b/tests/t067_report_diff.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
 import subprocess as sp
 
+from runtest import TestBase
+
 XDIR='xxx'
 YDIR='yyy'
 

diff --git a/tests/t079_replay_kernel_D.py b/tests/t079_replay_kernel_D.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
-import subprocess as sp
 import os
+import subprocess as sp
+
+from runtest import TestBase
 
 class TestCase(TestBase):
     def __init__(self):

diff --git a/tests/t080_replay_kernel_D2.py b/tests/t080_replay_kernel_D2.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
-import subprocess as sp
 import os
+import subprocess as sp
+
+from runtest import TestBase
 
 TDIR='xxx'
 

diff --git a/tests/t081_kernel_depth.py b/tests/t081_kernel_depth.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
 import os
 
+from runtest import TestBase
+
 class TestCase(TestBase):
     def __init__(self):
         TestBase.__init__(self, 'openclose', serial=True, result="""

diff --git a/tests/t091_replay_tid.py b/tests/t091_replay_tid.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
 import os.path
 
+from runtest import TestBase
+
 class TestCase(TestBase):
     def __init__(self):
         TestBase.__init__(self, 'fork', """

diff --git a/tests/t092_report_tid.py b/tests/t092_report_tid.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
 import os.path
 
+from runtest import TestBase
+
 class TestCase(TestBase):
     def __init__(self):
         TestBase.__init__(self, 'fork', """

diff --git a/tests/t095_graph_tid.py b/tests/t095_graph_tid.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
 import os.path
 
+from runtest import TestBase
+
 class TestCase(TestBase):
     def __init__(self):
         TestBase.__init__(self, 'fork', result="""

diff --git a/tests/t097_dump_basic.py b/tests/t097_dump_basic.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
 import subprocess as sp
 
+from runtest import TestBase
+
 class TestCase(TestBase):
     def __init__(self):
         TestBase.__init__(self, 'abc', """

diff --git a/tests/t098_dump_tid.py b/tests/t098_dump_tid.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
-import subprocess as sp
 import os.path
+import subprocess as sp
+
+from runtest import TestBase
 
 class TestCase(TestBase):
     def __init__(self):

diff --git a/tests/t099_dump_filter.py b/tests/t099_dump_filter.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
 import subprocess as sp
 
+from runtest import TestBase
+
 class TestCase(TestBase):
     def __init__(self):
         TestBase.__init__(self, 'abc', """

diff --git a/tests/t100_dump_depth.py b/tests/t100_dump_depth.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
 import subprocess as sp
 
+from runtest import TestBase
+
 class TestCase(TestBase):
     def __init__(self):
         TestBase.__init__(self, 'abc', """

diff --git a/tests/t103_dump_kernel.py b/tests/t103_dump_kernel.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
-import subprocess as sp
 import os
+import subprocess as sp
+
+from runtest import TestBase
 
 class TestCase(TestBase):
     def __init__(self):

diff --git a/tests/t104_graph_kernel.py b/tests/t104_graph_kernel.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
-import subprocess as sp
 import os
+import subprocess as sp
+
+from runtest import TestBase
 
 class TestCase(TestBase):
     def __init__(self):

diff --git a/tests/t111_kernel_tid.py b/tests/t111_kernel_tid.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
-import subprocess as sp
 import os
+import subprocess as sp
+
+from runtest import TestBase
 
 class TestCase(TestBase):
     def __init__(self):

diff --git a/tests/t117_time_range.py b/tests/t117_time_range.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
 import subprocess as sp
 
+from runtest import TestBase
+
 START=0
 
 class TestCase(TestBase):

diff --git a/tests/t122_time_range2.py b/tests/t122_time_range2.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
 import subprocess as sp
 
+from runtest import TestBase
+
 START=0
 
 class TestCase(TestBase):

diff --git a/tests/t125_report_range.py b/tests/t125_report_range.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
 import subprocess as sp
 
+from runtest import TestBase
+
 START=0
 
 class TestCase(TestBase):

diff --git a/tests/t129_session_tid.py b/tests/t129_session_tid.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
 import subprocess as sp
 
+from runtest import TestBase
+
 # Test that task.txt files with a tid in the SESS line still work
 
 class TestCase(TestBase):

diff --git a/tests/t132_trigger_kernel.py b/tests/t132_trigger_kernel.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
 import os
 
+from runtest import TestBase
+
 # there was a problem applying depth filter if it contains kernel functions
 class TestCase(TestBase):
     def __init__(self):

diff --git a/tests/t135_trigger_time2.py b/tests/t135_trigger_time2.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
 import subprocess as sp
 
+from runtest import TestBase
+
 TDIR='xxx'
 TIME=0
 UNIT=''

diff --git a/tests/t137_kernel_tid_update.py b/tests/t137_kernel_tid_update.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
 import os
 
+from runtest import TestBase
+
 class TestCase(TestBase):
     def __init__(self):
         TestBase.__init__(self, 'fork2', serial=True, result="""

diff --git a/tests/t138_kernel_dynamic.py b/tests/t138_kernel_dynamic.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
 import os
 
+from runtest import TestBase
+
 class TestCase(TestBase):
     def __init__(self):
         TestBase.__init__(self, 'openclose', serial=True, result="""

diff --git a/tests/t139_kernel_dynamic2.py b/tests/t139_kernel_dynamic2.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
 import os
 
+from runtest import TestBase
+
 class TestCase(TestBase):
     def __init__(self):
         TestBase.__init__(self, 'openclose', serial=True, result="""

diff --git a/tests/t141_recv_basic.py b/tests/t141_recv_basic.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
-import subprocess as sp
 import os.path
+import subprocess as sp
+
+from runtest import TestBase
 
 TDIR  = 'xxx'
 

diff --git a/tests/t142_recv_multi.py b/tests/t142_recv_multi.py
@@ -1,9 +1,10 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
-import subprocess as sp
 import os.path
 import random
+import subprocess as sp
+
+from runtest import TestBase
 
 TDIR  = 'xxx'
 

diff --git a/tests/t143_recv_kernel.py b/tests/t143_recv_kernel.py
@@ -1,9 +1,10 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
-import subprocess as sp
-import random
 import os
+import random
+import subprocess as sp
+
+from runtest import TestBase
 
 TDIR  = 'xxx'
 

diff --git a/tests/t148_event_kernel.py b/tests/t148_event_kernel.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
 import os
 
+from runtest import TestBase
+
 class TestCase(TestBase):
     def __init__(self):
         TestBase.__init__(self, 'sleep', serial=True, result="""

diff --git a/tests/t149_event_kernel2.py b/tests/t149_event_kernel2.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
 import os
 
+from runtest import TestBase
+
 class TestCase(TestBase):
     def __init__(self):
         TestBase.__init__(self, 'fork', serial=True, result="""

diff --git a/tests/t150_recv_event.py b/tests/t150_recv_event.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
-import subprocess as sp
 import os.path
+import subprocess as sp
+
+from runtest import TestBase
 
 TDIR  = 'xxx'
 

diff --git a/tests/t151_recv_runcmd.py b/tests/t151_recv_runcmd.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-from runtest import TestBase
 import subprocess as sp
 
+from runtest import TestBase
+
 TDIR = 'xxx'
 TMPF = 'out'