Skip to content

fix: don't filter files when copying dependencies to artifact folder for pip workflow #305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 22, 2021
Merged

fix: don't filter files when copying dependencies to artifact folder for pip workflow #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion aws_lambda_builders/actions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ def execute(self):

for name in targets:
target_path = os.path.join(self.target_dir, name)
LOG.info("Clean up action: %s is deleted", str(target_path))
LOG.debug("Clean up action: %s is deleted", str(target_path))

if os.path.isdir(target_path):
shutil.rmtree(target_path)
Expand Down
3 changes: 2 additions & 1 deletion aws_lambda_builders/workflows/python_pip/workflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ def __init__(self, source_dir, artifacts_dir, scratch_dir, manifest_path, runtim
# if combine_dependencies is false, will not copy the dependencies from dependencies folder to artifact
# folder
if self.dependencies_dir and self.combine_dependencies:
self.actions.append(CopySourceAction(self.dependencies_dir, artifacts_dir, excludes=self.EXCLUDED_FILES))
# when copying downloaded dependencies back to artifacts folder, don't exclude anything
self.actions.append(CopySourceAction(self.dependencies_dir, artifacts_dir))

self.actions.append(CopySourceAction(source_dir, artifacts_dir, excludes=self.EXCLUDED_FILES))

Expand Down
2 changes: 2 additions & 0 deletions tests/unit/workflows/python_pip/test_workflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ def test_workflow_sets_up_actions_with_download_dependencies_and_dependencies_di
self.assertIsInstance(self.workflow.actions[1], PythonPipBuildAction)
self.assertIsInstance(self.workflow.actions[2], CopySourceAction)
self.assertIsInstance(self.workflow.actions[3], CopySourceAction)
# check copying dependencies does not have any exclude
self.assertEqual(self.workflow.actions[2].excludes, [])

def test_workflow_sets_up_actions_without_download_dependencies_without_dependencies_dir(self):
osutils_mock = Mock(spec=self.osutils)
Expand Down