Skip to content

Commit 3c8ca4b

Browse files
jfussmildanielhawflau
authored
chore: Add isort and fix issues (#440)
* chore: Add isort and fix issues * Run ruff --fix --------- Co-authored-by: Jacob Fuss <[email protected]> Co-authored-by: Daniel Mil <[email protected]> Co-authored-by: Wing Fung Lau <[email protected]>
1 parent b7ec47b commit 3c8ca4b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+115
-104
lines changed

‎aws_lambda_builders/__main__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
Read the design document for explanation of the JSON-RPC interface
77
"""
88

9-
import sys
109
import json
11-
import os
1210
import logging
11+
import os
1312
import re
13+
import sys
1414

15+
from aws_lambda_builders import RPC_PROTOCOL_VERSION as lambda_builders_protocol_version
1516
from aws_lambda_builders.architecture import X86_64
1617
from aws_lambda_builders.builder import LambdaBuilder
17-
from aws_lambda_builders.exceptions import WorkflowNotFoundError, WorkflowUnknownError, WorkflowFailedError
18-
from aws_lambda_builders import RPC_PROTOCOL_VERSION as lambda_builders_protocol_version
18+
from aws_lambda_builders.exceptions import WorkflowFailedError, WorkflowNotFoundError, WorkflowUnknownError
1919

2020
log_level = int(os.environ.get("LAMBDA_BUILDERS_LOG_LEVEL", logging.INFO))
2121

‎aws_lambda_builders/actions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import os
77
import shutil
88
from pathlib import Path
9-
from typing import Set, Iterator, Tuple
9+
from typing import Iterator, Set, Tuple
1010

1111
from aws_lambda_builders import utils
1212
from aws_lambda_builders.utils import copytree

‎aws_lambda_builders/builder.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
"""
44

55
import importlib
6-
import os
76
import logging
7+
import os
88

99
from aws_lambda_builders.architecture import X86_64
10-
from aws_lambda_builders.registry import get_workflow, DEFAULT_REGISTRY
10+
from aws_lambda_builders.registry import DEFAULT_REGISTRY, get_workflow
1111
from aws_lambda_builders.workflow import Capability
1212

1313
LOG = logging.getLogger(__name__)

‎aws_lambda_builders/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
Common utilities for the library
33
"""
44

5+
import logging
6+
import os
57
import shutil
68
import sys
7-
import os
8-
import logging
99
from pathlib import Path
1010
from typing import Union
1111

‎aws_lambda_builders/validator.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
import logging
66

77
from aws_lambda_builders.architecture import ARM64, X86_64
8-
from aws_lambda_builders.exceptions import UnsupportedRuntimeError, UnsupportedArchitectureError
9-
8+
from aws_lambda_builders.exceptions import UnsupportedArchitectureError, UnsupportedRuntimeError
109

1110
LOG = logging.getLogger(__name__)
1211

‎aws_lambda_builders/workflow.py

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,24 @@
22
Implementation of a base workflow
33
"""
44
import functools
5-
import os
65
import logging
7-
6+
import os
87
from collections import namedtuple
98
from enum import Enum
109
from typing import Optional
1110

11+
from aws_lambda_builders.actions import ActionFailedError
12+
from aws_lambda_builders.architecture import X86_64
1213
from aws_lambda_builders.binary_path import BinaryPath
13-
from aws_lambda_builders.path_resolver import PathResolver
14-
from aws_lambda_builders.validator import RuntimeValidator
15-
from aws_lambda_builders.registry import DEFAULT_REGISTRY
1614
from aws_lambda_builders.exceptions import (
17-
WorkflowFailedError,
18-
WorkflowUnknownError,
1915
MisMatchRuntimeError,
2016
RuntimeValidatorError,
17+
WorkflowFailedError,
18+
WorkflowUnknownError,
2119
)
22-
from aws_lambda_builders.actions import ActionFailedError
23-
from aws_lambda_builders.architecture import X86_64
24-
20+
from aws_lambda_builders.path_resolver import PathResolver
21+
from aws_lambda_builders.registry import DEFAULT_REGISTRY
22+
from aws_lambda_builders.validator import RuntimeValidator
2523

2624
LOG = logging.getLogger(__name__)
2725

‎aws_lambda_builders/workflows/__init__.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
Officially supported builder workflows
33
"""
44

5-
import aws_lambda_builders.workflows.python_pip
6-
import aws_lambda_builders.workflows.nodejs_npm
7-
import aws_lambda_builders.workflows.ruby_bundler
5+
import aws_lambda_builders.workflows.custom_make
6+
import aws_lambda_builders.workflows.dotnet_clipackage
87
import aws_lambda_builders.workflows.go_modules
98
import aws_lambda_builders.workflows.java_gradle
109
import aws_lambda_builders.workflows.java_maven
11-
import aws_lambda_builders.workflows.dotnet_clipackage
12-
import aws_lambda_builders.workflows.custom_make
10+
import aws_lambda_builders.workflows.nodejs_npm
1311
import aws_lambda_builders.workflows.nodejs_npm_esbuild
12+
import aws_lambda_builders.workflows.python_pip
13+
import aws_lambda_builders.workflows.ruby_bundler
1414
import aws_lambda_builders.workflows.rust_cargo

‎aws_lambda_builders/workflows/custom_make/actions.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
import logging
66
from pathlib import Path
77

8-
from aws_lambda_builders.actions import BaseAction, Purpose, ActionFailedError
8+
from aws_lambda_builders.actions import ActionFailedError, BaseAction, Purpose
9+
910
from .exceptions import MakeFileNotFoundError
1011
from .make import MakeExecutionError
1112

‎aws_lambda_builders/workflows/custom_make/workflow.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
"""
22
ProvidedMakeWorkflow
33
"""
4-
from aws_lambda_builders.workflows.custom_make.validator import CustomMakeRuntimeValidator
5-
from aws_lambda_builders.workflow import BaseWorkflow, Capability, BuildInSourceSupport, BuildDirectory
64
from aws_lambda_builders.actions import CopySourceAction
75
from aws_lambda_builders.path_resolver import PathResolver
6+
from aws_lambda_builders.workflow import BaseWorkflow, BuildDirectory, BuildInSourceSupport, Capability
7+
from aws_lambda_builders.workflows.custom_make.validator import CustomMakeRuntimeValidator
8+
9+
from ...exceptions import WorkflowFailedError
810
from .actions import CustomMakeAction
9-
from .utils import OSUtils
1011
from .make import SubProcessMake
11-
from ...exceptions import WorkflowFailedError
12+
from .utils import OSUtils
1213

1314

1415
class CustomMakeWorkflow(BaseWorkflow):

‎aws_lambda_builders/workflows/dotnet_clipackage/actions.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
Actions for .NET dependency resolution with CLI Package
33
"""
44

5-
import threading
6-
import os
75
import logging
6+
import os
7+
import threading
88

9-
from aws_lambda_builders.actions import BaseAction, Purpose, ActionFailedError
10-
from aws_lambda_builders.workflow import BuildMode
9+
from aws_lambda_builders.actions import ActionFailedError, BaseAction, Purpose
1110
from aws_lambda_builders.architecture import ARM64
12-
from .utils import OSUtils
11+
from aws_lambda_builders.workflow import BuildMode
12+
1313
from .dotnetcli import DotnetCLIExecutionError
14+
from .utils import OSUtils
1415

1516
LOG = logging.getLogger(__name__)
1617

‎aws_lambda_builders/workflows/dotnet_clipackage/dotnetcli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
Wrapper around calls to dotent CLI through a subprocess.
33
"""
44

5-
import logging
65
import locale
6+
import logging
77

88
from .utils import OSUtils
99

‎aws_lambda_builders/workflows/dotnet_clipackage/utils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import platform
77
import subprocess
88
import zipfile
9+
910
from aws_lambda_builders.utils import which
1011

1112
LOG = logging.getLogger(__name__)

‎aws_lambda_builders/workflows/dotnet_clipackage/workflow.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""
22
.NET Core CLI Package Workflow
33
"""
4-
from aws_lambda_builders.workflow import BaseWorkflow, BuildDirectory, Capability, BuildInSourceSupport
4+
from aws_lambda_builders.workflow import BaseWorkflow, BuildDirectory, BuildInSourceSupport, Capability
55

66
from .actions import GlobalToolInstallAction, RunPackageAction
77
from .dotnetcli import SubprocessDotnetCLI

‎aws_lambda_builders/workflows/go_modules/actions.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
Action to build a Go project using standard Go tooling
33
"""
44

5-
from aws_lambda_builders.actions import BaseAction, Purpose, ActionFailedError
5+
from aws_lambda_builders.actions import ActionFailedError, BaseAction, Purpose
6+
67
from .builder import BuilderError
78

89

‎aws_lambda_builders/workflows/go_modules/builder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import logging
55
from pathlib import Path
66

7-
from aws_lambda_builders.workflow import BuildMode
87
from aws_lambda_builders.architecture import X86_64
98
from aws_lambda_builders.utils import get_goarch
9+
from aws_lambda_builders.workflow import BuildMode
1010

1111
LOG = logging.getLogger(__name__)
1212

‎aws_lambda_builders/workflows/go_modules/validator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"""
44

55
import logging
6-
import re
76
import os
7+
import re
88
import subprocess
99

10-
from aws_lambda_builders.validator import RuntimeValidator
1110
from aws_lambda_builders.exceptions import MisMatchRuntimeError
11+
from aws_lambda_builders.validator import RuntimeValidator
1212

1313
LOG = logging.getLogger(__name__)
1414

‎aws_lambda_builders/workflows/go_modules/workflow.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
"""
22
Go Modules Workflow
33
"""
4-
from aws_lambda_builders.workflow import BaseWorkflow, BuildDirectory, Capability, BuildInSourceSupport
4+
from aws_lambda_builders.workflow import BaseWorkflow, BuildDirectory, BuildInSourceSupport, Capability
55

66
from .actions import GoModulesBuildAction
77
from .builder import GoModulesBuilder
8-
from .validator import GoRuntimeValidator
98
from .utils import OSUtils
9+
from .validator import GoRuntimeValidator
1010

1111

1212
class GoModulesWorkflow(BaseWorkflow):

‎aws_lambda_builders/workflows/java/actions.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"""
44

55
import os
6+
67
from aws_lambda_builders.actions import ActionFailedError, BaseAction, Purpose
78

89

‎aws_lambda_builders/workflows/java/utils.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
import platform
77
import shutil
88
import subprocess
9-
from aws_lambda_builders.utils import which, copytree
9+
10+
from aws_lambda_builders.utils import copytree, which
1011

1112

1213
class OSUtils(object):

‎aws_lambda_builders/workflows/java_gradle/actions.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
"""
44

55
import os
6+
67
from aws_lambda_builders.actions import ActionFailedError, BaseAction, Purpose
7-
from .gradle import GradleExecutionError
8+
89
from ..java.utils import jar_file_filter
10+
from .gradle import GradleExecutionError
911

1012

1113
class JavaGradleBuildAction(BaseAction):

‎aws_lambda_builders/workflows/java_gradle/gradle_validator.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
import logging
66
import re
77

8-
from aws_lambda_builders.workflows.java.utils import OSUtils
98
from aws_lambda_builders.validator import RuntimeValidator
10-
9+
from aws_lambda_builders.workflows.java.utils import OSUtils
1110

1211
LOG = logging.getLogger(__name__)
1312

‎aws_lambda_builders/workflows/java_gradle/workflow.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
"""
44
import hashlib
55
import os
6+
67
from aws_lambda_builders.actions import CleanUpAction
7-
from aws_lambda_builders.workflow import BaseWorkflow, BuildDirectory, Capability, BuildInSourceSupport
8+
from aws_lambda_builders.workflow import BaseWorkflow, BuildDirectory, BuildInSourceSupport, Capability
89
from aws_lambda_builders.workflows.java.actions import JavaCopyDependenciesAction, JavaMoveDependenciesAction
910
from aws_lambda_builders.workflows.java.utils import OSUtils
1011

‎aws_lambda_builders/workflows/java_maven/actions.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
Actions for the Java Maven Workflow
33
"""
44

5-
import os
65
import logging
6+
import os
77
import shutil
88

99
from aws_lambda_builders.actions import ActionFailedError, BaseAction, Purpose
10-
from .maven import MavenExecutionError
10+
1111
from ..java.utils import jar_file_filter
12+
from .maven import MavenExecutionError
1213

1314
LOG = logging.getLogger(__name__)
1415

‎aws_lambda_builders/workflows/java_maven/maven_validator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import logging
66
import re
77

8-
from aws_lambda_builders.workflows.java.utils import OSUtils
98
from aws_lambda_builders.validator import RuntimeValidator
9+
from aws_lambda_builders.workflows.java.utils import OSUtils
1010

1111
LOG = logging.getLogger(__name__)
1212

‎aws_lambda_builders/workflows/java_maven/workflow.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
"""
22
Java Maven Workflow
33
"""
4-
from aws_lambda_builders.workflow import BaseWorkflow, BuildDirectory, Capability, BuildInSourceSupport
5-
from aws_lambda_builders.actions import CopySourceAction, CleanUpAction
4+
from aws_lambda_builders.actions import CleanUpAction, CopySourceAction
5+
from aws_lambda_builders.workflow import BaseWorkflow, BuildDirectory, BuildInSourceSupport, Capability
66
from aws_lambda_builders.workflows.java.actions import JavaCopyDependenciesAction, JavaMoveDependenciesAction
77
from aws_lambda_builders.workflows.java.utils import OSUtils
88

99
from .actions import (
1010
JavaMavenBuildAction,
11-
JavaMavenCopyDependencyAction,
1211
JavaMavenCopyArtifactsAction,
12+
JavaMavenCopyDependencyAction,
1313
JavaMavenCopyLayerArtifactsAction,
1414
)
1515
from .maven import SubprocessMaven

‎aws_lambda_builders/workflows/nodejs_npm/actions.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44

55
import logging
66

7-
from aws_lambda_builders.actions import BaseAction, Purpose, ActionFailedError
7+
from aws_lambda_builders.actions import ActionFailedError, BaseAction, Purpose
88
from aws_lambda_builders.utils import extract_tarfile
9+
910
from .npm import NpmExecutionError
1011

1112
LOG = logging.getLogger(__name__)

‎aws_lambda_builders/workflows/nodejs_npm/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
Commonly used utilities
33
"""
44

5+
import json
56
import os
67
import platform
7-
import subprocess
88
import shutil
9-
import json
9+
import subprocess
1010

1111

1212
class OSUtils(object):

0 commit comments

Comments
 (0)