chore: Add isort and fix issues

aws_lambda_builders/__main__.py

@@ -6,16 +6,16 @@
 Read the design document for explanation of the JSON-RPC interface
 """
 
-import sys
 import json
-import os
 import logging
+import os
 import re
+import sys
 
+from aws_lambda_builders import RPC_PROTOCOL_VERSION as lambda_builders_protocol_version
 from aws_lambda_builders.architecture import X86_64
 from aws_lambda_builders.builder import LambdaBuilder
-from aws_lambda_builders.exceptions import WorkflowNotFoundError, WorkflowUnknownError, WorkflowFailedError
-from aws_lambda_builders import RPC_PROTOCOL_VERSION as lambda_builders_protocol_version
+from aws_lambda_builders.exceptions import WorkflowFailedError, WorkflowNotFoundError, WorkflowUnknownError
 
 log_level = int(os.environ.get("LAMBDA_BUILDERS_LOG_LEVEL", logging.INFO))
 

aws_lambda_builders/actions.py

@@ -6,7 +6,7 @@
 import os
 import shutil
 from pathlib import Path
-from typing import Set, Iterator, Tuple
+from typing import Iterator, Set, Tuple
 
 from aws_lambda_builders import utils
 from aws_lambda_builders.utils import copytree

aws_lambda_builders/builder.py

@@ -3,11 +3,11 @@
 """
 
 import importlib
-import os
 import logging
+import os
 
 from aws_lambda_builders.architecture import X86_64
-from aws_lambda_builders.registry import get_workflow, DEFAULT_REGISTRY
+from aws_lambda_builders.registry import DEFAULT_REGISTRY, get_workflow
 from aws_lambda_builders.workflow import Capability
 
 LOG = logging.getLogger(__name__)

aws_lambda_builders/utils.py

@@ -2,10 +2,10 @@
 Common utilities for the library
 """
 
+import logging
+import os
 import shutil
 import sys
-import os
-import logging
 from pathlib import Path
 from typing import Union
 

aws_lambda_builders/validator.py

@@ -5,8 +5,7 @@
 import logging
 
 from aws_lambda_builders.architecture import ARM64, X86_64
-from aws_lambda_builders.exceptions import UnsupportedRuntimeError, UnsupportedArchitectureError
-
+from aws_lambda_builders.exceptions import UnsupportedArchitectureError, UnsupportedRuntimeError
 
 LOG = logging.getLogger(__name__)
 

aws_lambda_builders/workflow.py

@@ -2,26 +2,24 @@
 Implementation of a base workflow
 """
 import functools
-import os
 import logging
-
+import os
 from collections import namedtuple
 from enum import Enum
 from typing import Optional
 
+from aws_lambda_builders.actions import ActionFailedError
+from aws_lambda_builders.architecture import X86_64
 from aws_lambda_builders.binary_path import BinaryPath
-from aws_lambda_builders.path_resolver import PathResolver
-from aws_lambda_builders.validator import RuntimeValidator
-from aws_lambda_builders.registry import DEFAULT_REGISTRY
 from aws_lambda_builders.exceptions import (
-    WorkflowFailedError,
-    WorkflowUnknownError,
     MisMatchRuntimeError,
     RuntimeValidatorError,
+    WorkflowFailedError,
+    WorkflowUnknownError,
 )
-from aws_lambda_builders.actions import ActionFailedError
-from aws_lambda_builders.architecture import X86_64
-
+from aws_lambda_builders.path_resolver import PathResolver
+from aws_lambda_builders.registry import DEFAULT_REGISTRY
+from aws_lambda_builders.validator import RuntimeValidator
 
 LOG = logging.getLogger(__name__)
 

aws_lambda_builders/workflows/__init__.py

@@ -2,13 +2,13 @@
 Officially supported builder workflows
 """
 
-import aws_lambda_builders.workflows.python_pip
-import aws_lambda_builders.workflows.nodejs_npm
-import aws_lambda_builders.workflows.ruby_bundler
+import aws_lambda_builders.workflows.custom_make
+import aws_lambda_builders.workflows.dotnet_clipackage
 import aws_lambda_builders.workflows.go_modules
 import aws_lambda_builders.workflows.java_gradle
 import aws_lambda_builders.workflows.java_maven
-import aws_lambda_builders.workflows.dotnet_clipackage
-import aws_lambda_builders.workflows.custom_make
+import aws_lambda_builders.workflows.nodejs_npm
 import aws_lambda_builders.workflows.nodejs_npm_esbuild
+import aws_lambda_builders.workflows.python_pip
+import aws_lambda_builders.workflows.ruby_bundler
 import aws_lambda_builders.workflows.rust_cargo

aws_lambda_builders/workflows/custom_make/actions.py

@@ -5,7 +5,8 @@
 import logging
 from pathlib import Path
 
-from aws_lambda_builders.actions import BaseAction, Purpose, ActionFailedError
+from aws_lambda_builders.actions import ActionFailedError, BaseAction, Purpose
+
 from .exceptions import MakeFileNotFoundError
 from .make import MakeExecutionError
 

aws_lambda_builders/workflows/custom_make/workflow.py

@@ -1,14 +1,15 @@
 """
 ProvidedMakeWorkflow
 """
-from aws_lambda_builders.workflows.custom_make.validator import CustomMakeRuntimeValidator
-from aws_lambda_builders.workflow import BaseWorkflow, Capability, BuildInSourceSupport, BuildDirectory
 from aws_lambda_builders.actions import CopySourceAction
 from aws_lambda_builders.path_resolver import PathResolver
+from aws_lambda_builders.workflow import BaseWorkflow, BuildDirectory, BuildInSourceSupport, Capability
+from aws_lambda_builders.workflows.custom_make.validator import CustomMakeRuntimeValidator
+
+from ...exceptions import WorkflowFailedError
 from .actions import CustomMakeAction
-from .utils import OSUtils
 from .make import SubProcessMake
-from ...exceptions import WorkflowFailedError
+from .utils import OSUtils
 
 
 class CustomMakeWorkflow(BaseWorkflow):

aws_lambda_builders/workflows/dotnet_clipackage/actions.py

@@ -2,15 +2,16 @@
 Actions for .NET dependency resolution with CLI Package
 """
 
-import threading
-import os
 import logging
+import os
+import threading
 
-from aws_lambda_builders.actions import BaseAction, Purpose, ActionFailedError
-from aws_lambda_builders.workflow import BuildMode
+from aws_lambda_builders.actions import ActionFailedError, BaseAction, Purpose
 from aws_lambda_builders.architecture import ARM64
-from .utils import OSUtils
+from aws_lambda_builders.workflow import BuildMode
+
 from .dotnetcli import DotnetCLIExecutionError
+from .utils import OSUtils
 
 LOG = logging.getLogger(__name__)
 

aws_lambda_builders/workflows/dotnet_clipackage/dotnetcli.py

@@ -2,8 +2,8 @@
 Wrapper around calls to dotent CLI through a subprocess.
 """
 
-import logging
 import locale
+import logging
 
 from .utils import OSUtils
 

aws_lambda_builders/workflows/dotnet_clipackage/utils.py

@@ -6,6 +6,7 @@
 import platform
 import subprocess
 import zipfile
+
 from aws_lambda_builders.utils import which
 
 LOG = logging.getLogger(__name__)

aws_lambda_builders/workflows/dotnet_clipackage/workflow.py

@@ -1,7 +1,7 @@
 """
 .NET Core CLI Package Workflow
 """
-from aws_lambda_builders.workflow import BaseWorkflow, BuildDirectory, Capability, BuildInSourceSupport
+from aws_lambda_builders.workflow import BaseWorkflow, BuildDirectory, BuildInSourceSupport, Capability
 
 from .actions import GlobalToolInstallAction, RunPackageAction
 from .dotnetcli import SubprocessDotnetCLI

aws_lambda_builders/workflows/go_modules/actions.py

@@ -2,7 +2,8 @@
 Action to build a Go project using standard Go tooling
 """
 
-from aws_lambda_builders.actions import BaseAction, Purpose, ActionFailedError
+from aws_lambda_builders.actions import ActionFailedError, BaseAction, Purpose
+
 from .builder import BuilderError
 
 

aws_lambda_builders/workflows/go_modules/builder.py

@@ -4,9 +4,9 @@
 import logging
 from pathlib import Path
 
-from aws_lambda_builders.workflow import BuildMode
 from aws_lambda_builders.architecture import X86_64
 from aws_lambda_builders.utils import get_goarch
+from aws_lambda_builders.workflow import BuildMode
 
 LOG = logging.getLogger(__name__)
 

aws_lambda_builders/workflows/go_modules/validator.py

@@ -3,12 +3,12 @@
 """
 
 import logging
-import re
 import os
+import re
 import subprocess
 
-from aws_lambda_builders.validator import RuntimeValidator
 from aws_lambda_builders.exceptions import MisMatchRuntimeError
+from aws_lambda_builders.validator import RuntimeValidator
 
 LOG = logging.getLogger(__name__)
 

aws_lambda_builders/workflows/go_modules/workflow.py

@@ -1,12 +1,12 @@
 """
 Go Modules Workflow
 """
-from aws_lambda_builders.workflow import BaseWorkflow, BuildDirectory, Capability, BuildInSourceSupport
+from aws_lambda_builders.workflow import BaseWorkflow, BuildDirectory, BuildInSourceSupport, Capability
 
 from .actions import GoModulesBuildAction
 from .builder import GoModulesBuilder
-from .validator import GoRuntimeValidator
 from .utils import OSUtils
+from .validator import GoRuntimeValidator
 
 
 class GoModulesWorkflow(BaseWorkflow):

aws_lambda_builders/workflows/java/actions.py

@@ -3,6 +3,7 @@
 """
 
 import os
+
 from aws_lambda_builders.actions import ActionFailedError, BaseAction, Purpose
 
 

aws_lambda_builders/workflows/java/utils.py

@@ -6,7 +6,8 @@
 import platform
 import shutil
 import subprocess
-from aws_lambda_builders.utils import which, copytree
+
+from aws_lambda_builders.utils import copytree, which
 
 
 class OSUtils(object):

aws_lambda_builders/workflows/java_gradle/actions.py

@@ -3,9 +3,11 @@
 """
 
 import os
+
 from aws_lambda_builders.actions import ActionFailedError, BaseAction, Purpose
-from .gradle import GradleExecutionError
+
 from ..java.utils import jar_file_filter
+from .gradle import GradleExecutionError
 
 
 class JavaGradleBuildAction(BaseAction):

aws_lambda_builders/workflows/java_gradle/gradle_validator.py

@@ -5,9 +5,8 @@
 import logging
 import re
 
-from aws_lambda_builders.workflows.java.utils import OSUtils
 from aws_lambda_builders.validator import RuntimeValidator
-
+from aws_lambda_builders.workflows.java.utils import OSUtils
 
 LOG = logging.getLogger(__name__)
 

aws_lambda_builders/workflows/java_gradle/workflow.py

@@ -3,8 +3,9 @@
 """
 import hashlib
 import os
+
 from aws_lambda_builders.actions import CleanUpAction
-from aws_lambda_builders.workflow import BaseWorkflow, BuildDirectory, Capability, BuildInSourceSupport
+from aws_lambda_builders.workflow import BaseWorkflow, BuildDirectory, BuildInSourceSupport, Capability
 from aws_lambda_builders.workflows.java.actions import JavaCopyDependenciesAction, JavaMoveDependenciesAction
 from aws_lambda_builders.workflows.java.utils import OSUtils
 

aws_lambda_builders/workflows/java_maven/actions.py

@@ -2,13 +2,14 @@
 Actions for the Java Maven Workflow
 """
 
-import os
 import logging
+import os
 import shutil
 
 from aws_lambda_builders.actions import ActionFailedError, BaseAction, Purpose
-from .maven import MavenExecutionError
+
 from ..java.utils import jar_file_filter
+from .maven import MavenExecutionError
 
 LOG = logging.getLogger(__name__)
 

aws_lambda_builders/workflows/java_maven/maven_validator.py

@@ -5,8 +5,8 @@
 import logging
 import re
 
-from aws_lambda_builders.workflows.java.utils import OSUtils
 from aws_lambda_builders.validator import RuntimeValidator
+from aws_lambda_builders.workflows.java.utils import OSUtils
 
 LOG = logging.getLogger(__name__)
 

aws_lambda_builders/workflows/java_maven/workflow.py

@@ -1,15 +1,15 @@
 """
 Java Maven Workflow
 """
-from aws_lambda_builders.workflow import BaseWorkflow, BuildDirectory, Capability, BuildInSourceSupport
-from aws_lambda_builders.actions import CopySourceAction, CleanUpAction
+from aws_lambda_builders.actions import CleanUpAction, CopySourceAction
+from aws_lambda_builders.workflow import BaseWorkflow, BuildDirectory, BuildInSourceSupport, Capability
 from aws_lambda_builders.workflows.java.actions import JavaCopyDependenciesAction, JavaMoveDependenciesAction
 from aws_lambda_builders.workflows.java.utils import OSUtils
 
 from .actions import (
     JavaMavenBuildAction,
-    JavaMavenCopyDependencyAction,
     JavaMavenCopyArtifactsAction,
+    JavaMavenCopyDependencyAction,
     JavaMavenCopyLayerArtifactsAction,
 )
 from .maven import SubprocessMaven

aws_lambda_builders/workflows/nodejs_npm/actions.py

@@ -4,8 +4,9 @@
 
 import logging
 
-from aws_lambda_builders.actions import BaseAction, Purpose, ActionFailedError
+from aws_lambda_builders.actions import ActionFailedError, BaseAction, Purpose
 from aws_lambda_builders.utils import extract_tarfile
+
 from .npm import NpmExecutionError
 
 LOG = logging.getLogger(__name__)

aws_lambda_builders/workflows/nodejs_npm/utils.py

@@ -2,11 +2,11 @@
 Commonly used utilities
 """
 
+import json
 import os
 import platform
-import subprocess
 import shutil
-import json
+import subprocess
 
 
 class OSUtils(object):