From ea1629446478bad106ad7523ea916198f8f6d05e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Feb 2023 20:26:29 +0000 Subject: [PATCH 1/2] chore(deps-dev): bump black from 22.3.0 to 23.1.0 in /requirements Bumps [black](https://github.com/psf/black) from 22.3.0 to 23.1.0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/22.3.0...23.1.0) --- updated-dependencies: - dependency-name: black dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 4f95712ab..e186ca788 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -11,5 +11,5 @@ parameterized==0.7.4 pyelftools~=0.29 # Used to verify the generated Go binary architecture in integration tests (utils.py) # formatter -black==22.3.0 +black==23.1.0 ruff==0.0.238 \ No newline at end of file From 5261d88b975c3c6569eff251a096e35eadd7c6ba Mon Sep 17 00:00:00 2001 From: Jacob Fuss Date: Mon, 13 Feb 2023 14:35:13 -0600 Subject: [PATCH 2/2] run make black --- aws_lambda_builders/__main__.py | 1 - aws_lambda_builders/actions.py | 5 ----- aws_lambda_builders/builder.py | 1 - aws_lambda_builders/exceptions.py | 1 - aws_lambda_builders/registry.py | 1 - aws_lambda_builders/workflow.py | 2 -- aws_lambda_builders/workflows/custom_make/make.py | 1 - aws_lambda_builders/workflows/custom_make/workflow.py | 1 - .../workflows/dotnet_clipackage/dotnetcli_resolver.py | 1 - .../workflows/dotnet_clipackage/utils.py | 1 - .../workflows/dotnet_clipackage/workflow.py | 1 - aws_lambda_builders/workflows/go_modules/actions.py | 1 - aws_lambda_builders/workflows/go_modules/builder.py | 1 - aws_lambda_builders/workflows/go_modules/workflow.py | 2 -- aws_lambda_builders/workflows/nodejs_npm/npm.py | 1 - aws_lambda_builders/workflows/nodejs_npm/workflow.py | 1 - .../workflows/nodejs_npm_esbuild/esbuild.py | 1 - .../workflows/nodejs_npm_esbuild/workflow.py | 1 - aws_lambda_builders/workflows/python_pip/actions.py | 1 - aws_lambda_builders/workflows/python_pip/workflow.py | 2 -- aws_lambda_builders/workflows/ruby_bundler/workflow.py | 1 - tests/functional/test_builder.py | 2 -- tests/functional/test_cli.py | 4 ---- .../testdata/workflows/hello_workflow/write_hello.py | 1 - tests/functional/workflows/nodejs_npm/test_utils.py | 10 ---------- tests/functional/workflows/provided_make/test_utils.py | 3 --- .../workflows/python_pip/test_python_pip.py | 1 - tests/unit/test_actions.py | 2 -- tests/unit/test_builder.py | 4 ---- tests/unit/test_registry.py | 2 -- tests/unit/test_workflow.py | 7 ------- tests/unit/workflows/custom_make/test_workflow.py | 2 -- tests/unit/workflows/nodejs_npm/test_workflow.py | 5 ----- .../unit/workflows/nodejs_npm_esbuild/test_actions.py | 2 -- .../unit/workflows/nodejs_npm_esbuild/test_esbuild.py | 2 -- .../unit/workflows/nodejs_npm_esbuild/test_workflow.py | 7 ------- 36 files changed, 82 deletions(-) diff --git a/aws_lambda_builders/__main__.py b/aws_lambda_builders/__main__.py index 4efbfa5d3..2eb00058e 100644 --- a/aws_lambda_builders/__main__.py +++ b/aws_lambda_builders/__main__.py @@ -36,7 +36,6 @@ def _error_response(request_id, http_status_code, message): def _parse_version(version_string): - if VERSION_REGEX.match(version_string): return float(version_string) else: diff --git a/aws_lambda_builders/actions.py b/aws_lambda_builders/actions.py index 85aa38d8b..4bd3fbc75 100644 --- a/aws_lambda_builders/actions.py +++ b/aws_lambda_builders/actions.py @@ -55,7 +55,6 @@ def has_value(item): class _ActionMetaClass(type): def __new__(mcs, name, bases, class_dict): - cls = type.__new__(mcs, name, bases, class_dict) if cls.__name__ == "BaseAction": @@ -100,7 +99,6 @@ def __repr__(self): class CopySourceAction(BaseAction): - NAME = "CopySource" DESCRIPTION = "Copying source code while skipping certain commonly excluded files" @@ -117,7 +115,6 @@ def execute(self): class LinkSourceAction(BaseAction): - NAME = "LinkSource" DESCRIPTION = "Linking source code to the target folder" @@ -142,7 +139,6 @@ def execute(self): class CopyDependenciesAction(BaseAction): - NAME = "CopyDependencies" DESCRIPTION = "Copying dependencies while skipping source file" @@ -166,7 +162,6 @@ def execute(self): class MoveDependenciesAction(BaseAction): - NAME = "MoveDependencies" DESCRIPTION = "Moving dependencies while skipping source file" diff --git a/aws_lambda_builders/builder.py b/aws_lambda_builders/builder.py index 1be2c812d..338e0a3f1 100644 --- a/aws_lambda_builders/builder.py +++ b/aws_lambda_builders/builder.py @@ -21,7 +21,6 @@ class LambdaBuilder(object): """ def __init__(self, language, dependency_manager, application_framework, supported_workflows=None): - """ Initialize the builder. :type supported_workflows: list diff --git a/aws_lambda_builders/exceptions.py b/aws_lambda_builders/exceptions.py index f1c24eb1a..3e20aee89 100644 --- a/aws_lambda_builders/exceptions.py +++ b/aws_lambda_builders/exceptions.py @@ -4,7 +4,6 @@ class LambdaBuilderError(Exception): - MESSAGE = "" def __init__(self, **kwargs): diff --git a/aws_lambda_builders/registry.py b/aws_lambda_builders/registry.py index 60348d292..2f00fae65 100644 --- a/aws_lambda_builders/registry.py +++ b/aws_lambda_builders/registry.py @@ -24,7 +24,6 @@ def __getitem__(self, capability): return self._data[key] def __setitem__(self, capability, value): - key = self._make_key(capability) try: diff --git a/aws_lambda_builders/workflow.py b/aws_lambda_builders/workflow.py index 8aa740581..46a249166 100644 --- a/aws_lambda_builders/workflow.py +++ b/aws_lambda_builders/workflow.py @@ -32,7 +32,6 @@ class BuildMode(object): - DEBUG = "debug" RELEASE = "release" @@ -376,7 +375,6 @@ def run(self): raise WorkflowFailedError(workflow_name=self.NAME, action_name=action.NAME, reason=str(ex)) except Exception as ex: - LOG.debug("%s raised unhandled exception", action_info, exc_info=ex) raise WorkflowUnknownError(workflow_name=self.NAME, action_name=action.NAME, reason=str(ex)) diff --git a/aws_lambda_builders/workflows/custom_make/make.py b/aws_lambda_builders/workflows/custom_make/make.py index 52223a60e..974fdbd9d 100644 --- a/aws_lambda_builders/workflows/custom_make/make.py +++ b/aws_lambda_builders/workflows/custom_make/make.py @@ -49,7 +49,6 @@ def __init__(self, osutils, make_exe=None): self.make_exe = make_exe def run(self, args, env=None, cwd=None): - """ Runs the action. diff --git a/aws_lambda_builders/workflows/custom_make/workflow.py b/aws_lambda_builders/workflows/custom_make/workflow.py index c14161e86..5ea85202d 100644 --- a/aws_lambda_builders/workflows/custom_make/workflow.py +++ b/aws_lambda_builders/workflows/custom_make/workflow.py @@ -28,7 +28,6 @@ class CustomMakeWorkflow(BaseWorkflow): BUILD_IN_SOURCE_SUPPORT = BuildInSourceSupport.OPTIONALLY_SUPPORTED def __init__(self, source_dir, artifacts_dir, scratch_dir, manifest_path, runtime=None, osutils=None, **kwargs): - super(CustomMakeWorkflow, self).__init__( source_dir, artifacts_dir, scratch_dir, manifest_path, runtime=runtime, **kwargs ) diff --git a/aws_lambda_builders/workflows/dotnet_clipackage/dotnetcli_resolver.py b/aws_lambda_builders/workflows/dotnet_clipackage/dotnetcli_resolver.py index d1db0a8d7..51c1f8b66 100644 --- a/aws_lambda_builders/workflows/dotnet_clipackage/dotnetcli_resolver.py +++ b/aws_lambda_builders/workflows/dotnet_clipackage/dotnetcli_resolver.py @@ -13,7 +13,6 @@ def __init__(self, executable_search_paths=None, os_utils=None): @property def exec_paths(self): - # look for the windows executable paths = self.os_utils.which("dotnet.exe", executable_search_paths=self.executable_search_paths) if not paths: diff --git a/aws_lambda_builders/workflows/dotnet_clipackage/utils.py b/aws_lambda_builders/workflows/dotnet_clipackage/utils.py index 68ef63170..b04e8dcb5 100644 --- a/aws_lambda_builders/workflows/dotnet_clipackage/utils.py +++ b/aws_lambda_builders/workflows/dotnet_clipackage/utils.py @@ -44,7 +44,6 @@ def unzip(self, zip_file_path, output_dir, permission=None): """ with zipfile.ZipFile(zip_file_path, "r") as zip_ref: - # For each item in the zip file, extract the file and set permissions if available for file_info in zip_ref.infolist(): extracted_path = self._extract(file_info, output_dir, zip_ref) diff --git a/aws_lambda_builders/workflows/dotnet_clipackage/workflow.py b/aws_lambda_builders/workflows/dotnet_clipackage/workflow.py index 6c8aa26a4..5fc986e17 100644 --- a/aws_lambda_builders/workflows/dotnet_clipackage/workflow.py +++ b/aws_lambda_builders/workflows/dotnet_clipackage/workflow.py @@ -23,7 +23,6 @@ class DotnetCliPackageWorkflow(BaseWorkflow): BUILD_IN_SOURCE_SUPPORT = BuildInSourceSupport.EXCLUSIVELY_SUPPORTED def __init__(self, source_dir, artifacts_dir, scratch_dir, manifest_path, runtime=None, mode=None, **kwargs): - super(DotnetCliPackageWorkflow, self).__init__( source_dir, artifacts_dir, scratch_dir, manifest_path, runtime=runtime, mode=mode, **kwargs ) diff --git a/aws_lambda_builders/workflows/go_modules/actions.py b/aws_lambda_builders/workflows/go_modules/actions.py index b9b9cfade..c883e1213 100644 --- a/aws_lambda_builders/workflows/go_modules/actions.py +++ b/aws_lambda_builders/workflows/go_modules/actions.py @@ -8,7 +8,6 @@ class GoModulesBuildAction(BaseAction): - NAME = "Build" DESCRIPTION = "Building Go package with Go Modules" PURPOSE = Purpose.COMPILE_SOURCE diff --git a/aws_lambda_builders/workflows/go_modules/builder.py b/aws_lambda_builders/workflows/go_modules/builder.py index 52cf5a177..1c13b435e 100644 --- a/aws_lambda_builders/workflows/go_modules/builder.py +++ b/aws_lambda_builders/workflows/go_modules/builder.py @@ -19,7 +19,6 @@ def __init__(self, **kwargs): class GoModulesBuilder(object): - LANGUAGE = "go" def __init__(self, osutils, binaries, handler, mode=BuildMode.RELEASE, architecture=X86_64, trim_go_path=False): diff --git a/aws_lambda_builders/workflows/go_modules/workflow.py b/aws_lambda_builders/workflows/go_modules/workflow.py index 12ec8ec59..8c2b0e034 100644 --- a/aws_lambda_builders/workflows/go_modules/workflow.py +++ b/aws_lambda_builders/workflows/go_modules/workflow.py @@ -10,7 +10,6 @@ class GoModulesWorkflow(BaseWorkflow): - NAME = "GoModulesBuilder" CAPABILITY = Capability(language="go", dependency_manager="modules", application_framework=None) @@ -21,7 +20,6 @@ class GoModulesWorkflow(BaseWorkflow): def __init__( self, source_dir, artifacts_dir, scratch_dir, manifest_path, runtime=None, osutils=None, mode=None, **kwargs ): - super(GoModulesWorkflow, self).__init__( source_dir, artifacts_dir, scratch_dir, manifest_path, runtime=runtime, **kwargs ) diff --git a/aws_lambda_builders/workflows/nodejs_npm/npm.py b/aws_lambda_builders/workflows/nodejs_npm/npm.py index 0515b1809..674b6bd9c 100644 --- a/aws_lambda_builders/workflows/nodejs_npm/npm.py +++ b/aws_lambda_builders/workflows/nodejs_npm/npm.py @@ -47,7 +47,6 @@ def __init__(self, osutils, npm_exe=None): self.npm_exe = npm_exe def run(self, args, cwd=None): - """ Runs the action. diff --git a/aws_lambda_builders/workflows/nodejs_npm/workflow.py b/aws_lambda_builders/workflows/nodejs_npm/workflow.py index aa17cf17e..165ebf936 100644 --- a/aws_lambda_builders/workflows/nodejs_npm/workflow.py +++ b/aws_lambda_builders/workflows/nodejs_npm/workflow.py @@ -46,7 +46,6 @@ class NodejsNpmWorkflow(BaseWorkflow): BUILD_IN_SOURCE_SUPPORT = BuildInSourceSupport.NOT_SUPPORTED def __init__(self, source_dir, artifacts_dir, scratch_dir, manifest_path, runtime=None, osutils=None, **kwargs): - super(NodejsNpmWorkflow, self).__init__( source_dir, artifacts_dir, scratch_dir, manifest_path, runtime=runtime, **kwargs ) diff --git a/aws_lambda_builders/workflows/nodejs_npm_esbuild/esbuild.py b/aws_lambda_builders/workflows/nodejs_npm_esbuild/esbuild.py index 9b0362286..173d22e67 100644 --- a/aws_lambda_builders/workflows/nodejs_npm_esbuild/esbuild.py +++ b/aws_lambda_builders/workflows/nodejs_npm_esbuild/esbuild.py @@ -60,7 +60,6 @@ def esbuild_binary(self): ) def run(self, args, cwd=None): - """ Runs the action. diff --git a/aws_lambda_builders/workflows/nodejs_npm_esbuild/workflow.py b/aws_lambda_builders/workflows/nodejs_npm_esbuild/workflow.py index ddc6721f8..3c6a005db 100644 --- a/aws_lambda_builders/workflows/nodejs_npm_esbuild/workflow.py +++ b/aws_lambda_builders/workflows/nodejs_npm_esbuild/workflow.py @@ -46,7 +46,6 @@ class NodejsNpmEsbuildWorkflow(BaseWorkflow): BUILD_IN_SOURCE_SUPPORT = BuildInSourceSupport.OPTIONALLY_SUPPORTED def __init__(self, source_dir, artifacts_dir, scratch_dir, manifest_path, runtime=None, osutils=None, **kwargs): - super(NodejsNpmEsbuildWorkflow, self).__init__( source_dir, artifacts_dir, scratch_dir, manifest_path, runtime=runtime, **kwargs ) diff --git a/aws_lambda_builders/workflows/python_pip/actions.py b/aws_lambda_builders/workflows/python_pip/actions.py index 577de36f6..1e9c4d95f 100644 --- a/aws_lambda_builders/workflows/python_pip/actions.py +++ b/aws_lambda_builders/workflows/python_pip/actions.py @@ -11,7 +11,6 @@ class PythonPipBuildAction(BaseAction): - NAME = "ResolveDependencies" DESCRIPTION = "Installing dependencies from PIP" PURPOSE = Purpose.RESOLVE_DEPENDENCIES diff --git a/aws_lambda_builders/workflows/python_pip/workflow.py b/aws_lambda_builders/workflows/python_pip/workflow.py index d4f9a6ca2..1e87c9d5d 100644 --- a/aws_lambda_builders/workflows/python_pip/workflow.py +++ b/aws_lambda_builders/workflows/python_pip/workflow.py @@ -15,7 +15,6 @@ class PythonPipWorkflow(BaseWorkflow): - NAME = "PythonPipBuilder" CAPABILITY = Capability(language="python", dependency_manager="pip", application_framework=None) @@ -71,7 +70,6 @@ class PythonPipWorkflow(BaseWorkflow): BUILD_IN_SOURCE_SUPPORT = BuildInSourceSupport.NOT_SUPPORTED def __init__(self, source_dir, artifacts_dir, scratch_dir, manifest_path, runtime=None, osutils=None, **kwargs): - super(PythonPipWorkflow, self).__init__( source_dir, artifacts_dir, scratch_dir, manifest_path, runtime=runtime, **kwargs ) diff --git a/aws_lambda_builders/workflows/ruby_bundler/workflow.py b/aws_lambda_builders/workflows/ruby_bundler/workflow.py index 1e1f0e8db..451ef605a 100644 --- a/aws_lambda_builders/workflows/ruby_bundler/workflow.py +++ b/aws_lambda_builders/workflows/ruby_bundler/workflow.py @@ -30,7 +30,6 @@ class RubyBundlerWorkflow(BaseWorkflow): BUILD_IN_SOURCE_SUPPORT = BuildInSourceSupport.NOT_SUPPORTED def __init__(self, source_dir, artifacts_dir, scratch_dir, manifest_path, runtime=None, osutils=None, **kwargs): - super(RubyBundlerWorkflow, self).__init__( source_dir, artifacts_dir, scratch_dir, manifest_path, runtime=runtime, **kwargs ) diff --git a/tests/functional/test_builder.py b/tests/functional/test_builder.py index edc31a348..135934dea 100644 --- a/tests/functional/test_builder.py +++ b/tests/functional/test_builder.py @@ -13,7 +13,6 @@ class TestBuilderWithHelloWorkflow(TestCase): - HELLO_WORKFLOW_MODULE = "hello_workflow.write_hello" TEST_WORKFLOWS_FOLDER = os.path.join(os.path.dirname(__file__), "testdata", "workflows") @@ -45,7 +44,6 @@ def tearDown(self): sys.path.remove(self.TEST_WORKFLOWS_FOLDER) def test_run_hello_workflow_with_exec_paths(self): - self.hello_builder.build( self.source_dir, self.artifacts_dir, diff --git a/tests/functional/test_cli.py b/tests/functional/test_cli.py index b22dd68d5..71fa51725 100644 --- a/tests/functional/test_cli.py +++ b/tests/functional/test_cli.py @@ -19,12 +19,10 @@ class TestCliWithHelloWorkflow(TestCase): - HELLO_WORKFLOW_MODULE = "hello_workflow.write_hello" TEST_WORKFLOWS_FOLDER = os.path.join(os.path.dirname(__file__), "testdata", "workflows") def setUp(self): - self.source_dir = tempfile.mkdtemp() self.artifacts_dir = tempfile.mkdtemp() self.scratch_dir = os.path.join(tempfile.mkdtemp(), "scratch") @@ -57,7 +55,6 @@ def tearDown(self): ] ) def test_run_hello_workflow_with_backcompat(self, flavor, protocol_version): - request = { "jsonschema": "2.0", "id": 1234, @@ -123,7 +120,6 @@ def test_run_hello_workflow_with_backcompat(self, flavor, protocol_version): @parameterized.expand([("request_through_stdin"), ("request_through_argument")]) def test_run_hello_workflow_incompatible(self, flavor): - request_json = json.dumps( { "jsonschema": "2.0", diff --git a/tests/functional/testdata/workflows/hello_workflow/write_hello.py b/tests/functional/testdata/workflows/hello_workflow/write_hello.py index 295480041..4610a116e 100644 --- a/tests/functional/testdata/workflows/hello_workflow/write_hello.py +++ b/tests/functional/testdata/workflows/hello_workflow/write_hello.py @@ -31,7 +31,6 @@ def execute(self): class WriteHelloWorkflow(BaseWorkflow): - NAME = "WriteHelloWorkflow" CAPABILITY = Capability(language="python", dependency_manager="test", application_framework="test") DEFAULT_BUILD_DIR = BuildDirectory.SCRATCH diff --git a/tests/functional/workflows/nodejs_npm/test_utils.py b/tests/functional/workflows/nodejs_npm/test_utils.py index 738ef0c75..88c1371bb 100644 --- a/tests/functional/workflows/nodejs_npm/test_utils.py +++ b/tests/functional/workflows/nodejs_npm/test_utils.py @@ -10,11 +10,9 @@ class TestOSUtils(TestCase): def setUp(self): - self.osutils = utils.OSUtils() def test_copy_file_copies_existing_file_into_a_dir(self): - test_file = os.path.join(os.path.dirname(__file__), "test_data", "test.tgz") test_dir = tempfile.mkdtemp() @@ -28,7 +26,6 @@ def test_copy_file_copies_existing_file_into_a_dir(self): self.assertEqual({"test.tgz"}, output_files) def test_copy_file_copies_existing_file_into_a_file(self): - test_file = os.path.join(os.path.dirname(__file__), "test_data", "test.tgz") test_dir = tempfile.mkdtemp() @@ -42,7 +39,6 @@ def test_copy_file_copies_existing_file_into_a_file(self): self.assertEqual({"copied_test.tgz"}, output_files) def test_remove_file_removes_existing_file(self): - test_file = os.path.join(os.path.dirname(__file__), "test_data", "test.tgz") test_dir = tempfile.mkdtemp() @@ -56,7 +52,6 @@ def test_remove_file_removes_existing_file(self): self.assertFalse(os.path.isfile(copied_file)) def test_file_exists_checking_if_file_exists_in_a_dir(self): - existing_file = os.path.join(os.path.dirname(__file__), "test_data", "test.tgz") nonexisting_file = os.path.join(os.path.dirname(__file__), "test_data", "nonexisting.tgz") @@ -71,7 +66,6 @@ def test_dirname_returns_directory_for_path(self): self.assertEqual(dirname, os.path.dirname(sys.executable)) def test_abspath_returns_absolute_path(self): - result = self.osutils.abspath(".") self.assertTrue(os.path.isabs(result)) @@ -79,13 +73,11 @@ def test_abspath_returns_absolute_path(self): self.assertEqual(result, os.path.abspath(".")) def test_joinpath_joins_path_components(self): - result = self.osutils.joinpath("a", "b", "c") self.assertEqual(result, os.path.join("a", "b", "c")) def test_popen_runs_a_process_and_returns_outcome(self): - cwd_py = os.path.join(os.path.dirname(__file__), "..", "..", "testdata", "cwd.py") p = self.osutils.popen([sys.executable, cwd_py], stdout=self.osutils.pipe, stderr=self.osutils.pipe) @@ -97,7 +89,6 @@ def test_popen_runs_a_process_and_returns_outcome(self): self.assertEqual(out.decode("utf8").strip(), os.getcwd()) def test_popen_can_accept_cwd(self): - testdata_dir = os.path.join(os.path.dirname(__file__), "..", "..", "testdata") p = self.osutils.popen( @@ -111,7 +102,6 @@ def test_popen_can_accept_cwd(self): self.assertEqual(out.decode("utf8").strip(), os.path.abspath(testdata_dir)) def test_parse_json_reads_json_contents_into_memory(self): - json_file = os.path.join(os.path.dirname(__file__), "test_data", "test.json") json_contents = self.osutils.parse_json(json_file) self.assertEqual(json_contents["a"], 1) diff --git a/tests/functional/workflows/provided_make/test_utils.py b/tests/functional/workflows/provided_make/test_utils.py index ad78e8d44..25833068c 100644 --- a/tests/functional/workflows/provided_make/test_utils.py +++ b/tests/functional/workflows/provided_make/test_utils.py @@ -8,11 +8,9 @@ class TestOSUtils(TestCase): def setUp(self): - self.osutils = utils.OSUtils() def test_popen_runs_a_process_and_returns_outcome(self): - cwd_py = os.path.join(os.path.dirname(__file__), "..", "..", "testdata", "cwd.py") p = self.osutils.popen([sys.executable, cwd_py], stdout=self.osutils.pipe, stderr=self.osutils.pipe) @@ -24,7 +22,6 @@ def test_popen_runs_a_process_and_returns_outcome(self): self.assertEqual(out.decode("utf8").strip(), os.getcwd()) def test_popen_can_accept_cwd_and_env(self): - testdata_dir = os.path.join(os.path.dirname(__file__), "..", "..", "testdata") env = os.environ.copy() env.update({"SOME_ENV": "SOME_VALUE"}) diff --git a/tests/integration/workflows/python_pip/test_python_pip.py b/tests/integration/workflows/python_pip/test_python_pip.py index d11d7f331..dd97592a7 100644 --- a/tests/integration/workflows/python_pip/test_python_pip.py +++ b/tests/integration/workflows/python_pip/test_python_pip.py @@ -218,7 +218,6 @@ def test_must_resolve_local_dependency(self): self.assertIn(f, output_files) def test_must_fail_to_resolve_dependencies(self): - with self.assertRaises(WorkflowFailedError) as ctx: self.builder.build( self.source_dir, diff --git a/tests/unit/test_actions.py b/tests/unit/test_actions.py index f390b81e6..f6ffad08c 100644 --- a/tests/unit/test_actions.py +++ b/tests/unit/test_actions.py @@ -25,14 +25,12 @@ class MyAction(BaseAction): self.assertIsNotNone(action) def test_must_validate_name_property(self): - with self.assertRaises(ValueError): class MyAction(BaseAction): PURPOSE = Purpose.COPY_SOURCE def test_must_validate_purpose_property(self): - with self.assertRaises(ValueError): class MyAction(BaseAction): diff --git a/tests/unit/test_builder.py b/tests/unit/test_builder.py index b6ed80876..ed04d6faa 100644 --- a/tests/unit/test_builder.py +++ b/tests/unit/test_builder.py @@ -10,7 +10,6 @@ class TesetLambdaBuilder_init(TestCase): - DEFAULT_WORKFLOW_MODULE = "aws_lambda_builders.workflows" def setUp(self): @@ -21,7 +20,6 @@ def setUp(self): @patch("aws_lambda_builders.builder.importlib") @patch("aws_lambda_builders.builder.get_workflow") def test_must_load_all_default_workflows(self, get_workflow_mock, importlib_mock): - # instantiate builder = LambdaBuilder(self.lang, self.lang_framework, self.app_framework) @@ -40,7 +38,6 @@ def test_must_load_all_default_workflows(self, get_workflow_mock, importlib_mock @patch("aws_lambda_builders.builder.importlib") @patch("aws_lambda_builders.builder.get_workflow") def test_must_support_loading_custom_workflows(self, get_workflow_mock, importlib_mock): - modules = ["a.b.c", "c.d", "e.f", "z.k"] # instantiate @@ -54,7 +51,6 @@ def test_must_support_loading_custom_workflows(self, get_workflow_mock, importli @patch("aws_lambda_builders.builder.importlib") @patch("aws_lambda_builders.builder.get_workflow") def test_must_not_load_any_workflows(self, get_workflow_mock, importlib_mock): - modules = [] # Load no modules builder = LambdaBuilder(self.lang, self.lang_framework, self.app_framework, supported_workflows=modules) diff --git a/tests/unit/test_registry.py b/tests/unit/test_registry.py index 59a2e60c2..deeacbba6 100644 --- a/tests/unit/test_registry.py +++ b/tests/unit/test_registry.py @@ -30,7 +30,6 @@ def test_must_add_item(self): ] ) def test_must_add_item_with_optional_capabilities(self, capability): - self.registry[capability] = self.workflow_data self.assertEqual(self.workflow_data, self.registry[capability]) @@ -141,7 +140,6 @@ def test_must_get_workflow_from_default_registry(self): self.assertEqual(result, self.workflow_data) def test_must_raise_if_workflow_not_found(self): - # Don't register any workflow, and try querying with self.assertRaises(WorkflowNotFoundError): diff --git a/tests/unit/test_workflow.py b/tests/unit/test_workflow.py index 2058987ce..930aa5b76 100644 --- a/tests/unit/test_workflow.py +++ b/tests/unit/test_workflow.py @@ -22,7 +22,6 @@ class TestRegisteringWorkflows(TestCase): - CAPABILITY1 = Capability(language="test", dependency_manager="testframework", application_framework="appframework") CAPABILITY2 = Capability( @@ -33,7 +32,6 @@ def tearDown(self): DEFAULT_REGISTRY.clear() def test_must_register_one_workflow(self): - # Just loading the classes will register them to default registry class TestWorkflow(BaseWorkflow): NAME = "TestWorkflow" @@ -63,7 +61,6 @@ class TestWorkflow2(BaseWorkflow): self.assertEqual(get_workflow(self.CAPABILITY2), TestWorkflow2) def test_must_fail_if_name_not_present(self): - with self.assertRaises(ValueError) as ctx: class TestWorkflow1(BaseWorkflow): @@ -75,7 +72,6 @@ class TestWorkflow1(BaseWorkflow): self.assertEqual(str(ctx.exception), "Workflow must provide a valid name") def test_must_fail_if_capabilities_not_present(self): - with self.assertRaises(ValueError) as ctx: class TestWorkflow1(BaseWorkflow): @@ -87,7 +83,6 @@ class TestWorkflow1(BaseWorkflow): self.assertEqual(str(ctx.exception), "Workflow 'somename' must register valid capabilities") def test_must_fail_if_capabilities_is_wrong_type(self): - with self.assertRaises(ValueError) as ctx: class TestWorkflow1(BaseWorkflow): @@ -106,7 +101,6 @@ class TestWorkflow1(BaseWorkflow): ] ) def test_must_fail_if_build_in_source_support_invalid(self, build_in_source_support): - with self.assertRaises(ValueError) as ctx: class TestWorkflow1(BaseWorkflow): @@ -124,7 +118,6 @@ class TestWorkflow1(BaseWorkflow): ] ) def test_must_fail_if_default_build_dir_invalid(self, default_build_dir): - with self.assertRaises(ValueError) as ctx: class TestWorkflow1(BaseWorkflow): diff --git a/tests/unit/workflows/custom_make/test_workflow.py b/tests/unit/workflows/custom_make/test_workflow.py index 2f1239396..c82d21175 100644 --- a/tests/unit/workflows/custom_make/test_workflow.py +++ b/tests/unit/workflows/custom_make/test_workflow.py @@ -15,7 +15,6 @@ class TestProvidedMakeWorkflow(TestCase): """ def test_workflow_sets_up_make_actions(self): - workflow = CustomMakeWorkflow( "source", "artifacts", "scratch_dir", "manifest", options={"build_logical_id": "hello"} ) @@ -27,7 +26,6 @@ def test_workflow_sets_up_make_actions(self): self.assertIsInstance(workflow.actions[1], CustomMakeAction) def test_workflow_sets_up_make_actions_no_options(self): - with self.assertRaises(WorkflowFailedError): CustomMakeWorkflow("source", "artifacts", "scratch_dir", "manifest") diff --git a/tests/unit/workflows/nodejs_npm/test_workflow.py b/tests/unit/workflows/nodejs_npm/test_workflow.py index f4c967885..8a9016aa9 100644 --- a/tests/unit/workflows/nodejs_npm/test_workflow.py +++ b/tests/unit/workflows/nodejs_npm/test_workflow.py @@ -79,7 +79,6 @@ def test_workflow_sets_up_npm_actions_without_download_dependencies_with_depende self.assertIsInstance(workflow.actions[6], NodejsNpmLockFileCleanUpAction) def test_workflow_sets_up_npm_actions_without_bundler_if_manifest_doesnt_request_it(self): - self.osutils.file_exists.side_effect = [True, False, False] workflow = NodejsNpmWorkflow("source", "artifacts", "scratch_dir", "manifest", osutils=self.osutils) @@ -94,7 +93,6 @@ def test_workflow_sets_up_npm_actions_without_bundler_if_manifest_doesnt_request self.assertIsInstance(workflow.actions[5], NodejsNpmLockFileCleanUpAction) def test_workflow_sets_up_npm_actions_with_download_dependencies_and_dependencies_dir(self): - self.osutils.file_exists.side_effect = [True, False, False] workflow = NodejsNpmWorkflow( @@ -139,7 +137,6 @@ def test_workflow_sets_up_npm_actions_without_download_dependencies_and_without_ self.assertIsInstance(workflow.actions[4], NodejsNpmLockFileCleanUpAction) def test_workflow_sets_up_npm_actions_without_combine_dependencies(self): - self.osutils.file_exists.side_effect = [True, False, False] workflow = NodejsNpmWorkflow( @@ -188,7 +185,6 @@ def test_must_validate_architecture(self): self.assertEqual(workflow_with_arm.architecture, "arm64") def test_workflow_uses_npm_ci_if_shrinkwrap_exists_and_npm_ci_enabled(self): - self.osutils.file_exists.side_effect = [True, False, True] workflow = NodejsNpmWorkflow( @@ -212,7 +208,6 @@ def test_workflow_uses_npm_ci_if_shrinkwrap_exists_and_npm_ci_enabled(self): ) def test_workflow_uses_npm_ci_if_lockfile_exists_and_npm_ci_enabled(self): - self.osutils.file_exists.side_effect = [True, True] workflow = NodejsNpmWorkflow( diff --git a/tests/unit/workflows/nodejs_npm_esbuild/test_actions.py b/tests/unit/workflows/nodejs_npm_esbuild/test_actions.py index 5f665f0e2..964100385 100644 --- a/tests/unit/workflows/nodejs_npm_esbuild/test_actions.py +++ b/tests/unit/workflows/nodejs_npm_esbuild/test_actions.py @@ -138,7 +138,6 @@ def test_packages_with_custom_loaders(self): ) def test_checks_if_single_entrypoint_exists(self): - action = EsbuildBundleAction( "source", "artifacts", {"entry_points": ["x.js"]}, self.osutils, self.subprocess_esbuild, "package.json" ) @@ -152,7 +151,6 @@ def test_checks_if_single_entrypoint_exists(self): self.assertEqual(raised.exception.args[0], "entry point source/x.js does not exist") def test_checks_if_multiple_entrypoints_exist(self): - self.osutils.file_exists.side_effect = [True, False] action = EsbuildBundleAction( "source", diff --git a/tests/unit/workflows/nodejs_npm_esbuild/test_esbuild.py b/tests/unit/workflows/nodejs_npm_esbuild/test_esbuild.py index c9a6945b9..624cef36e 100644 --- a/tests/unit/workflows/nodejs_npm_esbuild/test_esbuild.py +++ b/tests/unit/workflows/nodejs_npm_esbuild/test_esbuild.py @@ -33,7 +33,6 @@ def setUp(self, OSUtilMock): self.under_test = SubprocessEsbuild(self.osutils, ["/a/b", "/c/d"], which) def test_run_executes_binary_found_in_exec_paths(self): - self.under_test.run(["arg-a", "arg-b"]) self.osutils.popen.assert_called_with( @@ -64,7 +63,6 @@ def test_raises_EsbuildExecutionError_with_err_text_if_retcode_is_not_0(self): self.assertEqual(raised.exception.args[0], "Esbuild Failed: some error text") def test_raises_EsbuildExecutionError_if_which_returns_no_results(self): - which = lambda cmd, executable_search_paths: [] self.under_test = SubprocessEsbuild(self.osutils, ["/a/b", "/c/d"], which) with self.assertRaises(EsbuildExecutionError) as raised: diff --git a/tests/unit/workflows/nodejs_npm_esbuild/test_workflow.py b/tests/unit/workflows/nodejs_npm_esbuild/test_workflow.py index c9e35b810..0c08a317a 100644 --- a/tests/unit/workflows/nodejs_npm_esbuild/test_workflow.py +++ b/tests/unit/workflows/nodejs_npm_esbuild/test_workflow.py @@ -43,7 +43,6 @@ def setUp(self, OSUtilMock): self.osutils.joinpath.side_effect = lambda a, b: "{}/{}".format(a, b) def test_workflow_sets_up_npm_actions_with_bundler_if_manifest_requests_it(self): - self.osutils.file_exists.side_effect = [True, False, False] workflow = NodejsNpmEsbuildWorkflow( @@ -64,7 +63,6 @@ def test_workflow_sets_up_npm_actions_with_bundler_if_manifest_requests_it(self) ) def test_sets_up_esbuild_search_path_from_npm_bin(self): - self.popen.out = b"project/" workflow = NodejsNpmEsbuildWorkflow( @@ -83,7 +81,6 @@ def test_sets_up_esbuild_search_path_from_npm_bin(self): self.assertEqual(esbuild.executable_search_paths, [str(Path("project/.bin"))]) def test_sets_up_esbuild_search_path_with_workflow_executable_search_paths_after_npm_bin(self): - self.popen.out = b"project" workflow = NodejsNpmEsbuildWorkflow( @@ -102,7 +99,6 @@ def test_sets_up_esbuild_search_path_with_workflow_executable_search_paths_after self.assertEqual(esbuild.executable_search_paths, [str(Path("project/.bin")), "other/bin"]) def test_workflow_uses_npm_ci_if_lockfile_exists(self): - self.osutils.file_exists.side_effect = [True, True] workflow = NodejsNpmEsbuildWorkflow( @@ -122,7 +118,6 @@ def test_workflow_uses_npm_ci_if_lockfile_exists(self): self.osutils.file_exists.assert_has_calls([call("source/package-lock.json")]) def test_workflow_uses_npm_ci_if_shrinkwrap_exists(self): - self.osutils.file_exists.side_effect = [True, False, True] workflow = NodejsNpmEsbuildWorkflow( @@ -144,7 +139,6 @@ def test_workflow_uses_npm_ci_if_shrinkwrap_exists(self): ) def test_workflow_doesnt_use_npm_ci_no_options_config(self): - self.osutils.file_exists.side_effect = [True, False, True] workflow = NodejsNpmEsbuildWorkflow( @@ -249,7 +243,6 @@ def test_workflow_sets_up_esbuild_actions_without_download_dependencies_with_dep self.assertIsInstance(workflow.actions[2], EsbuildBundleAction) def test_workflow_sets_up_esbuild_actions_with_download_dependencies_and_dependencies_dir(self): - self.osutils.file_exists.return_value = True workflow = NodejsNpmEsbuildWorkflow(