Merge branch 'develop'

aws · May 1, 2023 · 5ba3210 · 5ba3210
2 parents 8481690 + f405f1f
commit 5ba3210
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -1,6 +1,6 @@
 area/workflow/dotnet_clipackage:
-- aws_lambda_builders/workflows/dotnet_clipacakge/*
-- aws_lambda_builders/workflows/dotnet_clipacakge/**/*
+- aws_lambda_builders/workflows/dotnet_clipackage/*
+- aws_lambda_builders/workflows/dotnet_clipackage/**/*
 
 area/workflow/go_modules:
 - aws_lambda_builders/workflows/go_modules/*

diff --git a/aws_lambda_builders/__init__.py b/aws_lambda_builders/__init__.py
@@ -4,5 +4,5 @@
 
 # Changing version will trigger a new release!
 # Please make the version change as the last step of your development.
-__version__ = "1.30.0"
+__version__ = "1.31.0"
 RPC_PROTOCOL_VERSION = "0.3"
diff --git a/aws_lambda_builders/workflows/python_pip/packager.py b/aws_lambda_builders/workflows/python_pip/packager.py
@@ -661,7 +661,11 @@ class PipRunner(object):
     # Update regex pattern to correspond with the updated output from pip
     # Specific commit:
     # https://github.com/pypa/pip/commit/b28e2c4928cc62d90b738a4613886fb1e2ad6a81#diff-5225c8e359020adb25dfc8c7a505950fd649c6c5775789c6f6517f7913f94542L529
-    _LINK_IS_DIR_PATTERNS = ["Processing (.+?)\n"]
+    #
+    # Commit that adds extra info to the end:
+    # https://github.com/pypa/pip/commit/c546c99480875cfe4cdeaefa6d16bad9998d0f70#diff-5225c8e359020adb25dfc8c7a505950fd649c6c5775789c6f6517f7913f94542R275-R281
+    # eg. Processing ./package_a (from 123==1.1.1->-r requirements.txt (line 1))
+    _LINK_IS_DIR_PATTERNS = ["Processing (.+?)[ ,\n]"]
 
     def __init__(self, python_exe, pip, osutils=None):
         if osutils is None:

diff --git a/tests/unit/workflows/python_pip/test_packager.py b/tests/unit/workflows/python_pip/test_packager.py
@@ -270,6 +270,13 @@ def test_does_find_local_directory(self, pip_factory):
         assert len(pip.calls) == 2
         assert pip.calls[1].args == ["wheel", "--no-deps", "--wheel-dir", "directory", "../local-dir"]
 
+    def test_does_find_local_nested_directory(self, pip_factory):
+        pip, runner = pip_factory()
+        pip.add_return((0, b"Processing ../local-nested-dir (from xyz==123 and other info here)\n", 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-nested-dir"]
+
     def test_does_find_multiple_local_directories(self, pip_factory):
         pip, runner = pip_factory()
         pip.add_return(