Add isort

wpiformat/pyproject.toml

@@ -9,6 +9,7 @@ dependencies = [
   "clang-format==18.1.1",
   "clang-tidy==18.1.1",
   "gersemi==0.11.0",
+  "isort==5.11.2",
   "regex==2024.9.11"
 ]
 classifiers = [

wpiformat/wpiformat/clangformat.py

@@ -1,7 +1,7 @@
 """This task runs clang-format on the file."""
 
-from subprocess import Popen, PIPE
 import sys
+from subprocess import PIPE, Popen
 
 import clang_format
 

wpiformat/wpiformat/config.py

@@ -1,9 +1,10 @@
 """This class is for handling wpiformat config files."""
 
 import os
-import regex
 import sys
 
+import regex
+
 
 class Config:
     def __init__(self, directory, file_name):

wpiformat/wpiformat/includeguard.py

@@ -3,9 +3,10 @@
 """
 
 import os
+from enum import Enum
+
 import regex
 
-from enum import Enum
 from wpiformat.task import PipelineTask
 
 

wpiformat/wpiformat/includeorder.py

@@ -1,6 +1,7 @@
 """This task sorts C/C++ includes."""
 
 import os
+
 import regex
 
 from wpiformat.task import PipelineTask

wpiformat/wpiformat/licenseupdate.py

@@ -1,9 +1,10 @@
 """This task updates the license header at the top of the file."""
 
-from datetime import date
 import os
-import regex
 import subprocess
+from datetime import date
+
+import regex
 
 from wpiformat.config import Config
 from wpiformat.task import PipelineTask

wpiformat/wpiformat/pyformat.py

@@ -38,4 +38,11 @@ def run_batch(config_file, names):
             print("Error: black not found in PATH. Is it installed?", file=sys.stderr)
             return False
 
+        try:
+            args = [sys.executable, "-m", "isort", "--profile", "black", "-q"]
+            subprocess.run(args + names)
+        except FileNotFoundError:
+            print("Error: isort not found in PATH. Is it installed?", file=sys.stderr)
+            return False
+
         return True

wpiformat/wpiformat/task.py

@@ -1,7 +1,7 @@
 """Task base classes for wpiformat."""
 
-from abc import ABCMeta, abstractmethod
 import subprocess
+from abc import ABCMeta, abstractmethod
 
 
 class Task(metaclass=ABCMeta):

wpiformat/wpiformat/test/test_bracecomment.py

@@ -1,8 +1,9 @@
 import os
 
-from .test_tasktest import *
 from wpiformat.bracecomment import BraceComment
 
+from .test_tasktest import *
+
 
 def test_bracecomment():
     test = TaskTest(BraceComment())

wpiformat/wpiformat/test/test_cidentlist.py

@@ -1,8 +1,9 @@
 import os
 
-from .test_tasktest import *
 from wpiformat.cidentlist import CIdentList
 
+from .test_tasktest import *
+
 
 def test_cidentlist():
     test = TaskTest(CIdentList())

wpiformat/wpiformat/test/test_eofnewline.py

@@ -1,8 +1,9 @@
 import os
 
-from .test_tasktest import *
 from wpiformat.eofnewline import EofNewline
 
+from .test_tasktest import *
+
 
 def test_eofnewline():
     test = TaskTest(EofNewline())

wpiformat/wpiformat/test/test_gtestname.py

@@ -1,8 +1,9 @@
 import os
 
-from .test_tasktest import *
 from wpiformat.gtestname import GTestName
 
+from .test_tasktest import *
+
 
 def test_gtestname():
     test = TaskTest(GTestName())

wpiformat/wpiformat/test/test_includeguard.py

@@ -1,9 +1,10 @@
 import os
 
-from .test_tasktest import *
 from wpiformat.includeguard import IncludeGuard
 from wpiformat.task import Task
 
+from .test_tasktest import *
+
 
 def test_includeguard():
     test = TaskTest(IncludeGuard())

wpiformat/wpiformat/test/test_includeorder.py

@@ -1,8 +1,9 @@
 import os
 
-from .test_tasktest import *
 from wpiformat.includeorder import IncludeOrder
 
+from .test_tasktest import *
+
 
 def test_includeorder():
     test = TaskTest(IncludeOrder())

wpiformat/wpiformat/test/test_javaclass.py

@@ -1,8 +1,9 @@
 import os
 
-from .test_tasktest import *
 from wpiformat.javaclass import JavaClass
 
+from .test_tasktest import *
+
 
 def test_javaclass():
     test = TaskTest(JavaClass())

wpiformat/wpiformat/test/test_jni.py

@@ -1,8 +1,9 @@
 import os
 
-from .test_tasktest import *
 from wpiformat.jni import Jni
 
+from .test_tasktest import *
+
 
 def test_jni():
     test = TaskTest(Jni())

wpiformat/wpiformat/test/test_licenseupdate.py

@@ -1,13 +1,14 @@
-from datetime import date
 import os
-from pathlib import Path
 import subprocess
 import tempfile
+from datetime import date
+from pathlib import Path
 
-from .test_tasktest import *
 from wpiformat.config import Config
 from wpiformat.licenseupdate import LicenseUpdate
 
+from .test_tasktest import *
+
 
 class OpenTemporaryDirectory:
     def __init__(self):

wpiformat/wpiformat/test/test_stdlib.py

@@ -1,8 +1,9 @@
 import os
 
-from .test_tasktest import *
 from wpiformat.stdlib import Stdlib
 
+from .test_tasktest import *
+
 
 def test_stdlib():
     test = TaskTest(Stdlib())

wpiformat/wpiformat/test/test_tasktest.py

@@ -1,9 +1,9 @@
 """This class is for writing unit tests for tasks."""
 
-from enum import Enum
 import io
 import os
 import sys
+from enum import Enum
 
 from wpiformat.config import Config
 

wpiformat/wpiformat/test/test_usingdeclaration.py

@@ -1,8 +1,9 @@
 import os
 
-from .test_tasktest import *
 from wpiformat.usingdeclaration import UsingDeclaration
 
+from .test_tasktest import *
+
 
 def test_usingdeclaration():
     test = TaskTest(UsingDeclaration())

wpiformat/wpiformat/test/test_usingnamespacestd.py

@@ -1,8 +1,9 @@
 import os
 
-from .test_tasktest import *
 from wpiformat.usingnamespacestd import UsingNamespaceStd
 
+from .test_tasktest import *
+
 
 def test_usingnamespacestd():
     test = TaskTest(UsingNamespaceStd())

wpiformat/wpiformat/test/test_whitespace.py

@@ -1,8 +1,9 @@
 import os
 
-from .test_tasktest import *
 from wpiformat.whitespace import Whitespace
 
+from .test_tasktest import *
+
 
 def test_whitespace():
     test = TaskTest(Whitespace())

wpiformat/wpiformat/version.py

@@ -1,5 +1,5 @@
-from datetime import date
 import subprocess
+from datetime import date
 
 
 def get_version():