Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions aws_lambda_builders/workflows/python_pip/packager.py
Original file line number Diff line number Diff line change
Expand Up @@ -631,8 +631,8 @@ def download_all_dependencies(self, requirements_filename, directory):
raise NoSuchPackageError(str(package_name))
raise PackageDownloadError(error)
stdout = out.decode()
match = re.search(self._LINK_IS_DIR_PATTERN, stdout)
if match:
matches = re.finditer(self._LINK_IS_DIR_PATTERN, stdout)
for match in matches:
wheel_package_path = str(match.group(1))
# Looks odd we do not check on the error status of building the
# wheel here. We can assume this is a valid package path since
Expand Down
30 changes: 30 additions & 0 deletions tests/unit/workflows/python_pip/test_packager.py
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,36 @@ def test_download_wheels_no_wheels(self, pip_factory):
runner.download_manylinux_wheels([], 'directory', "abi")
assert len(pip.calls) == 0

def test_does_find_local_directory(self, pip_factory):
pip, runner = pip_factory()
pip.add_return((0,
(b"Processing ../local-dir\n"
b" Link is a directory,"
b" ignoring download_dir"),
b''))
runner.download_all_dependencies('requirements.txt', 'directory')
assert len(pip.calls) == 2
assert pip.calls[1].args == ['wheel', '--no-deps', '--wheel-dir',
'directory', '../local-dir']

def test_does_find_multiple_local_directories(self, pip_factory):
pip, runner = pip_factory()
pip.add_return((0,
(b"Processing ../local-dir-1\n"
b" Link is a directory,"
b" ignoring download_dir"
b"\nsome pip output...\n"
b"Processing ../local-dir-2\n"
b" Link is a directory,"
b" ignoring download_dir"),
b''))
runner.download_all_dependencies('requirements.txt', 'directory')
assert len(pip.calls) == 3
assert pip.calls[1].args == ['wheel', '--no-deps', '--wheel-dir',
'directory', '../local-dir-1']
assert pip.calls[2].args == ['wheel', '--no-deps', '--wheel-dir',
'directory', '../local-dir-2']

def test_raise_no_such_package_error(self, pip_factory):
pip, runner = pip_factory()
pip.add_return((1, b'',
Expand Down