diff --git a/aws_lambda_builders/__main__.py b/aws_lambda_builders/__main__.py index bc03e9856..4efbfa5d3 100644 --- a/aws_lambda_builders/__main__.py +++ b/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)) diff --git a/aws_lambda_builders/actions.py b/aws_lambda_builders/actions.py index 7cb65ceac..85aa38d8b 100644 --- a/aws_lambda_builders/actions.py +++ b/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 diff --git a/aws_lambda_builders/builder.py b/aws_lambda_builders/builder.py index 0558589e0..1be2c812d 100644 --- a/aws_lambda_builders/builder.py +++ b/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__) diff --git a/aws_lambda_builders/utils.py b/aws_lambda_builders/utils.py index a9a59dcd9..a1e55f7df 100644 --- a/aws_lambda_builders/utils.py +++ b/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 diff --git a/aws_lambda_builders/validator.py b/aws_lambda_builders/validator.py index 05c179c86..e565574f3 100644 --- a/aws_lambda_builders/validator.py +++ b/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__) diff --git a/aws_lambda_builders/workflow.py b/aws_lambda_builders/workflow.py index dcb58eb06..8aa740581 100644 --- a/aws_lambda_builders/workflow.py +++ b/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__) diff --git a/aws_lambda_builders/workflows/__init__.py b/aws_lambda_builders/workflows/__init__.py index 6966c0758..37dc4ba71 100644 --- a/aws_lambda_builders/workflows/__init__.py +++ b/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 diff --git a/aws_lambda_builders/workflows/custom_make/actions.py b/aws_lambda_builders/workflows/custom_make/actions.py index ce28e6129..71ff5740b 100644 --- a/aws_lambda_builders/workflows/custom_make/actions.py +++ b/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 diff --git a/aws_lambda_builders/workflows/custom_make/workflow.py b/aws_lambda_builders/workflows/custom_make/workflow.py index d5d6dbe23..c14161e86 100644 --- a/aws_lambda_builders/workflows/custom_make/workflow.py +++ b/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): diff --git a/aws_lambda_builders/workflows/dotnet_clipackage/actions.py b/aws_lambda_builders/workflows/dotnet_clipackage/actions.py index 0bbbd1716..5a3907a32 100644 --- a/aws_lambda_builders/workflows/dotnet_clipackage/actions.py +++ b/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__) diff --git a/aws_lambda_builders/workflows/dotnet_clipackage/dotnetcli.py b/aws_lambda_builders/workflows/dotnet_clipackage/dotnetcli.py index 72c6a76be..23a1c7144 100644 --- a/aws_lambda_builders/workflows/dotnet_clipackage/dotnetcli.py +++ b/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 diff --git a/aws_lambda_builders/workflows/dotnet_clipackage/utils.py b/aws_lambda_builders/workflows/dotnet_clipackage/utils.py index 5a03644ce..68ef63170 100644 --- a/aws_lambda_builders/workflows/dotnet_clipackage/utils.py +++ b/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__) diff --git a/aws_lambda_builders/workflows/dotnet_clipackage/workflow.py b/aws_lambda_builders/workflows/dotnet_clipackage/workflow.py index 320e7fd95..6c8aa26a4 100644 --- a/aws_lambda_builders/workflows/dotnet_clipackage/workflow.py +++ b/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 diff --git a/aws_lambda_builders/workflows/go_modules/actions.py b/aws_lambda_builders/workflows/go_modules/actions.py index 1354a2704..b9b9cfade 100644 --- a/aws_lambda_builders/workflows/go_modules/actions.py +++ b/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 diff --git a/aws_lambda_builders/workflows/go_modules/builder.py b/aws_lambda_builders/workflows/go_modules/builder.py index 43c8a0e1e..52cf5a177 100644 --- a/aws_lambda_builders/workflows/go_modules/builder.py +++ b/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__) diff --git a/aws_lambda_builders/workflows/go_modules/validator.py b/aws_lambda_builders/workflows/go_modules/validator.py index c83f95d43..9c2d27fba 100644 --- a/aws_lambda_builders/workflows/go_modules/validator.py +++ b/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__) diff --git a/aws_lambda_builders/workflows/go_modules/workflow.py b/aws_lambda_builders/workflows/go_modules/workflow.py index 86f22a318..12ec8ec59 100644 --- a/aws_lambda_builders/workflows/go_modules/workflow.py +++ b/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): diff --git a/aws_lambda_builders/workflows/java/actions.py b/aws_lambda_builders/workflows/java/actions.py index e412be822..23d286e34 100644 --- a/aws_lambda_builders/workflows/java/actions.py +++ b/aws_lambda_builders/workflows/java/actions.py @@ -3,6 +3,7 @@ """ import os + from aws_lambda_builders.actions import ActionFailedError, BaseAction, Purpose diff --git a/aws_lambda_builders/workflows/java/utils.py b/aws_lambda_builders/workflows/java/utils.py index 8bcf0e636..d528f21c1 100644 --- a/aws_lambda_builders/workflows/java/utils.py +++ b/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): diff --git a/aws_lambda_builders/workflows/java_gradle/actions.py b/aws_lambda_builders/workflows/java_gradle/actions.py index e92dcb16b..f1beb2960 100644 --- a/aws_lambda_builders/workflows/java_gradle/actions.py +++ b/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): diff --git a/aws_lambda_builders/workflows/java_gradle/gradle_validator.py b/aws_lambda_builders/workflows/java_gradle/gradle_validator.py index d383e74cd..5a190c183 100644 --- a/aws_lambda_builders/workflows/java_gradle/gradle_validator.py +++ b/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__) diff --git a/aws_lambda_builders/workflows/java_gradle/workflow.py b/aws_lambda_builders/workflows/java_gradle/workflow.py index d83b54650..e3e4825d9 100644 --- a/aws_lambda_builders/workflows/java_gradle/workflow.py +++ b/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 diff --git a/aws_lambda_builders/workflows/java_maven/actions.py b/aws_lambda_builders/workflows/java_maven/actions.py index 090ae3259..9002f859b 100644 --- a/aws_lambda_builders/workflows/java_maven/actions.py +++ b/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__) diff --git a/aws_lambda_builders/workflows/java_maven/maven_validator.py b/aws_lambda_builders/workflows/java_maven/maven_validator.py index 80a9bbe57..6d6063d33 100644 --- a/aws_lambda_builders/workflows/java_maven/maven_validator.py +++ b/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__) diff --git a/aws_lambda_builders/workflows/java_maven/workflow.py b/aws_lambda_builders/workflows/java_maven/workflow.py index 164c365c8..d22c2b40a 100644 --- a/aws_lambda_builders/workflows/java_maven/workflow.py +++ b/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 diff --git a/aws_lambda_builders/workflows/nodejs_npm/actions.py b/aws_lambda_builders/workflows/nodejs_npm/actions.py index afadb5572..9ca9c1e20 100644 --- a/aws_lambda_builders/workflows/nodejs_npm/actions.py +++ b/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__) diff --git a/aws_lambda_builders/workflows/nodejs_npm/utils.py b/aws_lambda_builders/workflows/nodejs_npm/utils.py index fb5cb904b..e2d5afe10 100644 --- a/aws_lambda_builders/workflows/nodejs_npm/utils.py +++ b/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): diff --git a/aws_lambda_builders/workflows/nodejs_npm/workflow.py b/aws_lambda_builders/workflows/nodejs_npm/workflow.py index fa2c5f5cb..aa17cf17e 100644 --- a/aws_lambda_builders/workflows/nodejs_npm/workflow.py +++ b/aws_lambda_builders/workflows/nodejs_npm/workflow.py @@ -4,25 +4,25 @@ import logging -from aws_lambda_builders.path_resolver import PathResolver -from aws_lambda_builders.workflow import BaseWorkflow, BuildDirectory, Capability, BuildInSourceSupport from aws_lambda_builders.actions import ( - CopySourceAction, CleanUpAction, CopyDependenciesAction, + CopySourceAction, MoveDependenciesAction, ) +from aws_lambda_builders.path_resolver import PathResolver +from aws_lambda_builders.workflow import BaseWorkflow, BuildDirectory, BuildInSourceSupport, Capability from .actions import ( - NodejsNpmPackAction, - NodejsNpmLockFileCleanUpAction, + NodejsNpmCIAction, NodejsNpmInstallAction, + NodejsNpmLockFileCleanUpAction, + NodejsNpmPackAction, NodejsNpmrcAndLockfileCopyAction, NodejsNpmrcCleanUpAction, - NodejsNpmCIAction, ) -from .utils import OSUtils from .npm import SubprocessNpm +from .utils import OSUtils LOG = logging.getLogger(__name__) diff --git a/aws_lambda_builders/workflows/nodejs_npm_esbuild/actions.py b/aws_lambda_builders/workflows/nodejs_npm_esbuild/actions.py index 903ee1fac..fbb5cb012 100644 --- a/aws_lambda_builders/workflows/nodejs_npm_esbuild/actions.py +++ b/aws_lambda_builders/workflows/nodejs_npm_esbuild/actions.py @@ -4,7 +4,7 @@ import logging from typing import Any, Dict -from aws_lambda_builders.actions import BaseAction, Purpose, ActionFailedError +from aws_lambda_builders.actions import ActionFailedError, BaseAction, Purpose from aws_lambda_builders.workflows.nodejs_npm.utils import OSUtils from aws_lambda_builders.workflows.nodejs_npm_esbuild.esbuild import EsbuildCommandBuilder, SubprocessEsbuild from aws_lambda_builders.workflows.nodejs_npm_esbuild.exceptions import EsbuildExecutionError diff --git a/aws_lambda_builders/workflows/nodejs_npm_esbuild/esbuild.py b/aws_lambda_builders/workflows/nodejs_npm_esbuild/esbuild.py index 1149e0088..9b0362286 100644 --- a/aws_lambda_builders/workflows/nodejs_npm_esbuild/esbuild.py +++ b/aws_lambda_builders/workflows/nodejs_npm_esbuild/esbuild.py @@ -1,10 +1,9 @@ """ Wrapper around calling esbuild through a subprocess. """ -from pathlib import Path - import logging -from typing import Dict, Any, List +from pathlib import Path +from typing import Any, Dict, List from aws_lambda_builders.actions import ActionFailedError from aws_lambda_builders.workflows.nodejs_npm.utils import OSUtils diff --git a/aws_lambda_builders/workflows/nodejs_npm_esbuild/workflow.py b/aws_lambda_builders/workflows/nodejs_npm_esbuild/workflow.py index aac9908cd..ddc6721f8 100644 --- a/aws_lambda_builders/workflows/nodejs_npm_esbuild/workflow.py +++ b/aws_lambda_builders/workflows/nodejs_npm_esbuild/workflow.py @@ -2,26 +2,27 @@ NodeJS NPM Workflow using the esbuild bundler """ -import logging import json +import logging from pathlib import Path -from aws_lambda_builders.workflow import BaseWorkflow, BuildDirectory, Capability, BuildInSourceSupport from aws_lambda_builders.actions import ( CleanUpAction, CopySourceAction, - MoveDependenciesAction, LinkSourceAction, + MoveDependenciesAction, ) from aws_lambda_builders.utils import which -from .actions import ( - EsbuildBundleAction, -) -from .esbuild import SubprocessEsbuild, EsbuildExecutionError +from aws_lambda_builders.workflow import BaseWorkflow, BuildDirectory, BuildInSourceSupport, Capability + +from ...path_resolver import PathResolver from ..nodejs_npm import NodejsNpmWorkflow from ..nodejs_npm.npm import SubprocessNpm from ..nodejs_npm.utils import OSUtils -from ...path_resolver import PathResolver +from .actions import ( + EsbuildBundleAction, +) +from .esbuild import EsbuildExecutionError, SubprocessEsbuild LOG = logging.getLogger(__name__) diff --git a/aws_lambda_builders/workflows/python_pip/actions.py b/aws_lambda_builders/workflows/python_pip/actions.py index 62128c85d..577de36f6 100644 --- a/aws_lambda_builders/workflows/python_pip/actions.py +++ b/aws_lambda_builders/workflows/python_pip/actions.py @@ -2,11 +2,12 @@ Action to resolve Python dependencies using PIP """ -from aws_lambda_builders.actions import BaseAction, Purpose, ActionFailedError +from aws_lambda_builders.actions import ActionFailedError, BaseAction, Purpose from aws_lambda_builders.architecture import X86_64 from aws_lambda_builders.workflows.python_pip.utils import OSUtils + from .exceptions import MissingPipError -from .packager import PythonPipDependencyBuilder, PackagerError, DependencyBuilder, SubprocessPip, PipRunner +from .packager import DependencyBuilder, PackagerError, PipRunner, PythonPipDependencyBuilder, SubprocessPip class PythonPipBuildAction(BaseAction): diff --git a/aws_lambda_builders/workflows/python_pip/compat.py b/aws_lambda_builders/workflows/python_pip/compat.py index f29037ef6..f783ce2e4 100644 --- a/aws_lambda_builders/workflows/python_pip/compat.py +++ b/aws_lambda_builders/workflows/python_pip/compat.py @@ -44,7 +44,6 @@ def prevent_msvc_compiling_patch(): import distutils._msvccompiler import distutils.msvc9compiler import distutils.msvccompiler - from distutils.errors import CompileError def raise_compile_error(*args, **kwargs): diff --git a/aws_lambda_builders/workflows/python_pip/packager.py b/aws_lambda_builders/workflows/python_pip/packager.py index 1b7d23a69..788f0b3fa 100644 --- a/aws_lambda_builders/workflows/python_pip/packager.py +++ b/aws_lambda_builders/workflows/python_pip/packager.py @@ -2,17 +2,16 @@ Installs packages using PIP """ -import sys +import logging import re import subprocess -import logging +import sys from email.parser import FeedParser from aws_lambda_builders.architecture import ARM64, X86_64 from aws_lambda_builders.utils import extract_tarfile -from .compat import pip_import_string -from .compat import pip_no_compile_c_env_vars -from .compat import pip_no_compile_c_shim + +from .compat import pip_import_string, pip_no_compile_c_env_vars, pip_no_compile_c_shim from .utils import OSUtils LOG = logging.getLogger(__name__) diff --git a/aws_lambda_builders/workflows/python_pip/utils.py b/aws_lambda_builders/workflows/python_pip/utils.py index e4f4b6a5a..207b4cdd4 100644 --- a/aws_lambda_builders/workflows/python_pip/utils.py +++ b/aws_lambda_builders/workflows/python_pip/utils.py @@ -2,15 +2,15 @@ Commonly used utilities """ +import contextlib import io import os -import zipfile -import contextlib -import tempfile import shutil import subprocess import sys -from typing import Optional, List +import tempfile +import zipfile +from typing import List, Optional EXPERIMENTAL_FLAG_BUILD_PERFORMANCE = "experimentalBuildPerformance" diff --git a/aws_lambda_builders/workflows/python_pip/validator.py b/aws_lambda_builders/workflows/python_pip/validator.py index 7790b04c5..76e3d87a9 100644 --- a/aws_lambda_builders/workflows/python_pip/validator.py +++ b/aws_lambda_builders/workflows/python_pip/validator.py @@ -6,8 +6,9 @@ import os import subprocess -from aws_lambda_builders.validator import RuntimeValidator from aws_lambda_builders.exceptions import MisMatchRuntimeError +from aws_lambda_builders.validator import RuntimeValidator + from .utils import OSUtils LOG = logging.getLogger(__name__) diff --git a/aws_lambda_builders/workflows/python_pip/workflow.py b/aws_lambda_builders/workflows/python_pip/workflow.py index 58477cef4..d4f9a6ca2 100644 --- a/aws_lambda_builders/workflows/python_pip/workflow.py +++ b/aws_lambda_builders/workflows/python_pip/workflow.py @@ -3,10 +3,10 @@ """ import logging +from aws_lambda_builders.actions import CleanUpAction, CopySourceAction, LinkSourceAction +from aws_lambda_builders.path_resolver import PathResolver from aws_lambda_builders.workflow import BaseWorkflow, BuildDirectory, BuildInSourceSupport, Capability -from aws_lambda_builders.actions import CopySourceAction, CleanUpAction, LinkSourceAction from aws_lambda_builders.workflows.python_pip.validator import PythonRuntimeValidator -from aws_lambda_builders.path_resolver import PathResolver from .actions import PythonPipBuildAction from .utils import OSUtils, is_experimental_build_improvements_enabled diff --git a/aws_lambda_builders/workflows/ruby_bundler/actions.py b/aws_lambda_builders/workflows/ruby_bundler/actions.py index ffc9ad048..63d26eada 100644 --- a/aws_lambda_builders/workflows/ruby_bundler/actions.py +++ b/aws_lambda_builders/workflows/ruby_bundler/actions.py @@ -4,7 +4,8 @@ import logging -from aws_lambda_builders.actions import BaseAction, Purpose, ActionFailedError +from aws_lambda_builders.actions import ActionFailedError, BaseAction, Purpose + from .bundler import BundlerExecutionError LOG = logging.getLogger(__name__) diff --git a/aws_lambda_builders/workflows/ruby_bundler/utils.py b/aws_lambda_builders/workflows/ruby_bundler/utils.py index cf58fca7a..6d8b512d7 100644 --- a/aws_lambda_builders/workflows/ruby_bundler/utils.py +++ b/aws_lambda_builders/workflows/ruby_bundler/utils.py @@ -4,8 +4,8 @@ import os import platform -import subprocess import shutil +import subprocess class OSUtils(object): diff --git a/aws_lambda_builders/workflows/ruby_bundler/workflow.py b/aws_lambda_builders/workflows/ruby_bundler/workflow.py index 060664eec..1e1f0e8db 100644 --- a/aws_lambda_builders/workflows/ruby_bundler/workflow.py +++ b/aws_lambda_builders/workflows/ruby_bundler/workflow.py @@ -3,11 +3,12 @@ """ import logging +from aws_lambda_builders.actions import CleanUpAction, CopyDependenciesAction, CopySourceAction from aws_lambda_builders.workflow import BaseWorkflow, BuildDirectory, BuildInSourceSupport, Capability -from aws_lambda_builders.actions import CopySourceAction, CopyDependenciesAction, CleanUpAction + from .actions import RubyBundlerInstallAction, RubyBundlerVendorAction -from .utils import OSUtils from .bundler import SubprocessBundler +from .utils import OSUtils LOG = logging.getLogger(__name__) diff --git a/aws_lambda_builders/workflows/rust_cargo/actions.py b/aws_lambda_builders/workflows/rust_cargo/actions.py index c585594c8..9ca568fb6 100644 --- a/aws_lambda_builders/workflows/rust_cargo/actions.py +++ b/aws_lambda_builders/workflows/rust_cargo/actions.py @@ -5,13 +5,13 @@ import logging import os -from aws_lambda_builders.workflow import BuildMode from aws_lambda_builders.actions import ActionFailedError, BaseAction, Purpose -from aws_lambda_builders.architecture import X86_64, ARM64 +from aws_lambda_builders.architecture import ARM64, X86_64 +from aws_lambda_builders.workflow import BuildMode + from .exceptions import CargoLambdaExecutionException from .utils import OSUtils - LOG = logging.getLogger(__name__) diff --git a/aws_lambda_builders/workflows/rust_cargo/cargo_lambda.py b/aws_lambda_builders/workflows/rust_cargo/cargo_lambda.py index 0facf0286..a9db9d995 100644 --- a/aws_lambda_builders/workflows/rust_cargo/cargo_lambda.py +++ b/aws_lambda_builders/workflows/rust_cargo/cargo_lambda.py @@ -4,14 +4,13 @@ import io import logging import os -import subprocess import shutil +import subprocess import threading from .exceptions import CargoLambdaExecutionException from .utils import OSUtils - LOG = logging.getLogger(__name__) diff --git a/aws_lambda_builders/workflows/rust_cargo/utils.py b/aws_lambda_builders/workflows/rust_cargo/utils.py index 99aed66ab..a6f7805dd 100644 --- a/aws_lambda_builders/workflows/rust_cargo/utils.py +++ b/aws_lambda_builders/workflows/rust_cargo/utils.py @@ -1,6 +1,6 @@ import os -import subprocess import shutil +import subprocess class OSUtils(object): diff --git a/aws_lambda_builders/workflows/rust_cargo/workflow.py b/aws_lambda_builders/workflows/rust_cargo/workflow.py index dcd971c65..80ea11b09 100644 --- a/aws_lambda_builders/workflows/rust_cargo/workflow.py +++ b/aws_lambda_builders/workflows/rust_cargo/workflow.py @@ -2,9 +2,10 @@ Rust Cargo Workflow """ -from aws_lambda_builders.utils import which from aws_lambda_builders.path_resolver import PathResolver -from aws_lambda_builders.workflow import BaseWorkflow, Capability, BuildInSourceSupport, BuildDirectory +from aws_lambda_builders.utils import which +from aws_lambda_builders.workflow import BaseWorkflow, BuildDirectory, BuildInSourceSupport, Capability + from .actions import RustCargoLambdaBuildAction, RustCopyAndRenameAction from .cargo_lambda import SubprocessCargoLambda from .exceptions import CargoLambdaExecutionException diff --git a/pyproject.toml b/pyproject.toml index ca16b1909..7ebfc86f1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,6 +5,7 @@ select = [ "E", # Pycodestyle "F", # Pyflakes "PL", # pylint + "I", # isort ] ignore = ["PLR0913"]