aedi: change imports according to isort

aedi/builder.py

@@ -18,16 +18,22 @@
 
 import argparse
 import os
-from pathlib import Path
-from platform import machine
 import shutil
 import subprocess
 import typing
+from pathlib import Path
+from platform import machine
 
 from .state import BuildState
 from .target import Target, targets
-from .utility import CaseInsensitiveDict, CommandLineOptions, TargetPlatform, symlink_directory,\
-    OS_VERSION_X86_64, OS_VERSION_ARM64
+from .utility import (
+    OS_VERSION_ARM64,
+    OS_VERSION_X86_64,
+    CaseInsensitiveDict,
+    CommandLineOptions,
+    TargetPlatform,
+    symlink_directory,
+)
 
 
 class Builder(object):

aedi/state.py

@@ -16,14 +16,14 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from distutils.version import StrictVersion
 import hashlib
 import os
-from pathlib import Path
 import shutil
 import subprocess
 import typing
 import urllib.request
+from distutils.version import StrictVersion
+from pathlib import Path
 
 from .utility import CommandLineOptions
 

aedi/target/base.py

@@ -17,17 +17,22 @@
 #
 
 import copy
-from distutils.version import StrictVersion
 import os
-from pathlib import Path
-from platform import machine
 import re
 import shutil
 import subprocess
 import typing
+from distutils.version import StrictVersion
+from pathlib import Path
+from platform import machine
 
-from ..utility import CommandLineOptions, symlink_directory, OS_VERSION_X86_64, OS_VERSION_ARM64
 from ..state import BuildState
+from ..utility import (
+    OS_VERSION_ARM64,
+    OS_VERSION_X86_64,
+    CommandLineOptions,
+    symlink_directory,
+)
 
 
 class Target:

aedi/target/library_tier1.py

@@ -17,7 +17,6 @@
 #
 
 from .base import *
-from ..state import BuildState
 
 
 class Bzip2Target(MakeTarget):

aedi/target/library_tier2.py

@@ -19,7 +19,6 @@
 import glob
 
 from .base import *
-from ..state import BuildState
 
 
 class BrotliTarget(CMakeStaticDependencyTarget):

aedi/target/main.py

@@ -16,13 +16,13 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from distutils.version import StrictVersion
 import os
-from platform import machine
 import shutil
+from distutils.version import StrictVersion
+from platform import machine
 
-from .base import CMakeTarget, MakeTarget
 from ..state import BuildState
+from .base import CMakeTarget, MakeTarget
 
 
 class MakeMainTarget(MakeTarget):

aedi/target/special.py

@@ -20,8 +20,8 @@ import shlex
 import shutil
 import subprocess
 
-from .base import Target, BuildTarget
 from ..state import BuildState
+from .base import BuildTarget, Target
 
 
 class CleanTarget(Target):

aedi/target/tools.py

@@ -21,7 +21,6 @@ import shlex
 import zipapp
 
 from .base import *
-from ..state import BuildState
 
 
 class CMakeBuildTarget(CMakeTarget):

aedi/utility.py

@@ -17,12 +17,11 @@
 #
 
 import collections.abc
-from distutils.version import StrictVersion
 import os
-from pathlib import Path
 import shutil
 import typing
-
+from distutils.version import StrictVersion
+from pathlib import Path
 
 # Minimum OS versions
 OS_VERSION_X86_64 = StrictVersion('10.9')