aws-lambda-builders 1.42.0__tar.gz → 1.44.0__tar.gz

{aws_lambda_builders-1.42.0 → aws_lambda_builders-1.44.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aws_lambda_builders
-Version: 1.42.0
+Version: 1.44.0
 Summary: Python library to compile, build & package AWS Lambda functions for several runtimes & frameworks.
 Home-page: https://github.com/awslabs/aws-lambda-builders
 Author: Amazon Web Services
@@ -25,9 +25,23 @@ Classifier: Topic :: Internet
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Topic :: Utilities
 Requires-Python: >=3.7
-Provides-Extra: dev
 License-File: LICENSE
 License-File: NOTICE
+Requires-Dist: setuptools
+Requires-Dist: wheel
+Provides-Extra: dev
+Requires-Dist: coverage==7.2.7; python_version < "3.8" and extra == "dev"
+Requires-Dist: coverage==7.3.2; python_version >= "3.8" and extra == "dev"
+Requires-Dist: flake8==3.3.0; python_version < "3.8" and extra == "dev"
+Requires-Dist: flake8==3.8.4; python_version >= "3.8" and extra == "dev"
+Requires-Dist: pytest-cov==4.1.0; extra == "dev"
+Requires-Dist: isort<5,>=4.2.5; python_version < "3.8" and extra == "dev"
+Requires-Dist: pytest>=6.1.1; extra == "dev"
+Requires-Dist: parameterized==0.9.0; extra == "dev"
+Requires-Dist: pyelftools~=0.30; extra == "dev"
+Requires-Dist: black==22.6.0; python_version < "3.8" and extra == "dev"
+Requires-Dist: black==23.11.0; python_version >= "3.8" and extra == "dev"
+Requires-Dist: ruff==0.1.7; extra == "dev"
 
 ## Lambda Builders
 

{aws_lambda_builders-1.42.0 → aws_lambda_builders-1.44.0}/aws_lambda_builders/__init__.py

@@ -5,5 +5,5 @@ AWS Lambda Builder Library
 # Changing version will trigger a new release!
 # Please make the version change as the last step of your development.
 
-__version__ = "1.42.0"
+__version__ = "1.44.0"
 RPC_PROTOCOL_VERSION = "0.3"

{aws_lambda_builders-1.42.0 → aws_lambda_builders-1.44.0}/aws_lambda_builders/actions.py

@@ -57,7 +57,7 @@ class _ActionMetaClass(type):
     def __new__(mcs, name, bases, class_dict):
         cls = type.__new__(mcs, name, bases, class_dict)
 
-        if cls.__name__ == "BaseAction":
+        if cls.__name__ in ["BaseAction", "NodejsNpmInstallOrUpdateBaseAction"]:
             return cls
 
         # Validate class variables
@@ -156,7 +156,12 @@ class LinkSinglePathAction(BaseAction):
         self._dest = dest
 
     def execute(self):
+        source_path = Path(self._source)
         destination_path = Path(self._dest)
+        if not source_path.exists():
+            # Source path doesn't exist, nothing to symlink
+            LOG.debug("Source path %s does not exist, skipping generating symlink", source_path)
+            return
         if not destination_path.exists():
             os.makedirs(destination_path.parent, exist_ok=True)
         utils.create_symlink_or_copy(str(self._source), str(destination_path))

{aws_lambda_builders-1.42.0 → aws_lambda_builders-1.44.0}/aws_lambda_builders/utils.py

@@ -198,6 +198,10 @@ def create_symlink_or_copy(source: str, destination: str) -> None:
     """Tries to create symlink, if it fails it will copy source into destination"""
     LOG.debug("Creating symlink; source: %s, destination: %s", source, destination)
     try:
+        if Path(destination).exists() and Path(destination).is_symlink():
+            # The symlink is already in place, don't try re-creating it
+            LOG.debug("Symlink between %s and %s already exists, skipping generating symlink", source, destination)
+            return
         os.symlink(Path(source).absolute(), Path(destination).absolute())
     except OSError as ex:
         LOG.warning(

{aws_lambda_builders-1.42.0 → aws_lambda_builders-1.44.0}/aws_lambda_builders/workflows/nodejs_npm/actions.py

@@ -72,17 +72,14 @@ class NodejsNpmPackAction(BaseAction):
             raise ActionFailedError(str(ex))
 
 
-class NodejsNpmInstallAction(BaseAction):
-
+class NodejsNpmInstallOrUpdateBaseAction(BaseAction):
     """
-    A Lambda Builder Action that installs NPM project dependencies
+    A base Lambda Builder Action that is used for installs or updating NPM project dependencies
     """
 
-    NAME = "NpmInstall"
-    DESCRIPTION = "Installing dependencies from NPM"
     PURPOSE = Purpose.RESOLVE_DEPENDENCIES
 
-    def __init__(self, install_dir: str, subprocess_npm: SubprocessNpm, install_links: Optional[bool] = False):
+    def __init__(self, install_dir: str, subprocess_npm: SubprocessNpm):
         """
         Parameters
         ----------
@@ -90,14 +87,20 @@ class NodejsNpmInstallAction(BaseAction):
             Dependencies will be installed in this directory.
         subprocess_npm : SubprocessNpm
             An instance of the NPM process wrapper
-        install_links : Optional[bool]
-            Uses the --install-links npm option if True, by default False
         """
 
-        super(NodejsNpmInstallAction, self).__init__()
+        super().__init__()
         self.install_dir = install_dir
         self.subprocess_npm = subprocess_npm
-        self.install_links = install_links
+
+
+class NodejsNpmInstallAction(NodejsNpmInstallOrUpdateBaseAction):
+    """
+    A Lambda Builder Action that installs NPM project dependencies
+    """
+
+    NAME = "NpmInstall"
+    DESCRIPTION = "Installing dependencies from NPM"
 
     def execute(self):
         """
@@ -109,9 +112,38 @@ class NodejsNpmInstallAction(BaseAction):
             LOG.debug("NODEJS installing in: %s", self.install_dir)
 
             command = ["install", "-q", "--no-audit", "--no-save", "--unsafe-perm", "--production"]
-            if self.install_links:
-                command.append("--install-links")
+            self.subprocess_npm.run(command, cwd=self.install_dir)
+
+        except NpmExecutionError as ex:
+            raise ActionFailedError(str(ex))
+
+
+class NodejsNpmUpdateAction(NodejsNpmInstallOrUpdateBaseAction):
+    """
+    A Lambda Builder Action that installs NPM project dependencies
+    """
 
+    NAME = "NpmUpdate"
+    DESCRIPTION = "Updating dependencies from NPM"
+
+    def execute(self):
+        """
+        Runs the action.
+
+        :raises lambda_builders.actions.ActionFailedError: when NPM execution fails
+        """
+        try:
+            LOG.debug("NODEJS updating in: %s", self.install_dir)
+
+            command = [
+                "update",
+                "--no-audit",
+                "--no-save",
+                "--unsafe-perm",
+                "--production",
+                "--no-package-lock",
+                "--install-links",
+            ]
             self.subprocess_npm.run(command, cwd=self.install_dir)
 
         except NpmExecutionError as ex:

{aws_lambda_builders-1.42.0 → aws_lambda_builders-1.44.0}/aws_lambda_builders/workflows/nodejs_npm/workflow.py

@@ -22,6 +22,7 @@ from aws_lambda_builders.workflows.nodejs_npm.actions import (
     NodejsNpmPackAction,
     NodejsNpmrcAndLockfileCopyAction,
     NodejsNpmrcCleanUpAction,
+    NodejsNpmUpdateAction,
 )
 from aws_lambda_builders.workflows.nodejs_npm.npm import SubprocessNpm
 from aws_lambda_builders.workflows.nodejs_npm.utils import OSUtils
@@ -119,7 +120,7 @@ class NodejsNpmWorkflow(BaseWorkflow):
                     subprocess_npm=subprocess_npm,
                     osutils=osutils,
                     build_options=self.options,
-                    install_links=is_building_in_source,
+                    is_building_in_source=is_building_in_source,
                 )
             )
 
@@ -211,7 +212,7 @@ class NodejsNpmWorkflow(BaseWorkflow):
         subprocess_npm: SubprocessNpm,
         osutils: OSUtils,
         build_options: Optional[dict],
-        install_links: Optional[bool] = False,
+        is_building_in_source: Optional[bool] = False,
     ):
         """
         Get the install action used to install dependencies.
@@ -228,8 +229,8 @@ class NodejsNpmWorkflow(BaseWorkflow):
             An instance of OS Utilities for file manipulation
         build_options : Optional[dict]
             Object containing build options configurations
-        install_links : Optional[bool]
-            Uses the --install-links npm option if True, by default False
+        is_building_in_source : Optional[bool]
+            States whether --build-in-source flag is set or not
 
         Returns
         -------
@@ -245,12 +246,13 @@ class NodejsNpmWorkflow(BaseWorkflow):
 
         if (osutils.file_exists(lockfile_path) or osutils.file_exists(shrinkwrap_path)) and npm_ci_option:
             return NodejsNpmCIAction(
-                install_dir=install_dir, subprocess_npm=subprocess_npm, install_links=install_links
+                install_dir=install_dir, subprocess_npm=subprocess_npm, install_links=is_building_in_source
             )
 
-        return NodejsNpmInstallAction(
-            install_dir=install_dir, subprocess_npm=subprocess_npm, install_links=install_links
-        )
+        if is_building_in_source:
+            return NodejsNpmUpdateAction(install_dir=install_dir, subprocess_npm=subprocess_npm)
+
+        return NodejsNpmInstallAction(install_dir=install_dir, subprocess_npm=subprocess_npm)
 
     @staticmethod
     def can_use_install_links(npm_process: SubprocessNpm) -> bool:

{aws_lambda_builders-1.42.0 → aws_lambda_builders-1.44.0}/aws_lambda_builders/workflows/nodejs_npm_esbuild/workflow.py

@@ -118,7 +118,7 @@ class NodejsNpmEsbuildWorkflow(BaseWorkflow):
                     subprocess_npm=self.subprocess_npm,
                     osutils=self.osutils,
                     build_options=self.options,
-                    install_links=is_building_in_source,
+                    is_building_in_source=is_building_in_source,
                 )
             )
 

{aws_lambda_builders-1.42.0 → aws_lambda_builders-1.44.0}/aws_lambda_builders/workflows/python_pip/actions.py

@@ -49,11 +49,18 @@ class PythonPipBuildAction(BaseAction):
         pip_runner = PipRunner(python_exe=python_with_pip, pip=pip)
 
         dependency_builder = DependencyBuilder(
-            osutils=self._os_utils, pip_runner=pip_runner, runtime=self.runtime, architecture=self.architecture
+            osutils=self._os_utils,
+            python_exe=python_with_pip,
+            pip_runner=pip_runner,
+            runtime=self.runtime,
+            architecture=self.architecture,
         )
 
         package_builder = PythonPipDependencyBuilder(
-            osutils=self._os_utils, runtime=self.runtime, dependency_builder=dependency_builder
+            osutils=self._os_utils,
+            runtime=self.runtime,
+            python_exe=python_with_pip,
+            dependency_builder=dependency_builder,
         )
         try:
             target_artifact_dir = self.artifacts_dir

{aws_lambda_builders-1.42.0 → aws_lambda_builders-1.44.0}/aws_lambda_builders/workflows/python_pip/packager.py

@@ -5,7 +5,6 @@ Installs packages using PIP
 import logging
 import re
 import subprocess
-import sys
 from email.parser import FeedParser
 from typing import Tuple
 
@@ -97,7 +96,7 @@ def get_lambda_abi(runtime):
 
 
 class PythonPipDependencyBuilder(object):
-    def __init__(self, runtime, osutils=None, dependency_builder=None, architecture=X86_64):
+    def __init__(self, runtime, python_exe, osutils=None, dependency_builder=None, architecture=X86_64):
         """Initialize a PythonPipDependencyBuilder.
 
         :type runtime: str
@@ -122,7 +121,7 @@ class PythonPipDependencyBuilder(object):
             self.osutils = OSUtils()
 
         if dependency_builder is None:
-            dependency_builder = DependencyBuilder(self.osutils, runtime, architecture=architecture)
+            dependency_builder = DependencyBuilder(self.osutils, python_exe, runtime, architecture=architecture)
         self._dependency_builder = dependency_builder
 
     def build_dependencies(self, artifacts_dir_path, scratch_dir_path, requirements_path, ui=None, config=None):
@@ -211,7 +210,7 @@ class DependencyBuilder(object):
     # Unlikely to hit this case.
     _DEFAULT_GLIBC = (2, 17)
 
-    def __init__(self, osutils, runtime, pip_runner=None, architecture=X86_64):
+    def __init__(self, osutils, runtime, python_exe, pip_runner=None, architecture=X86_64):
         """Initialize a DependencyBuilder.
 
         :type osutils: :class:`lambda_builders.utils.OSUtils`
@@ -229,8 +228,9 @@ class DependencyBuilder(object):
         :param architecture: Architecture to build for.
         """
         self._osutils = osutils
+        self.python_exe = python_exe
         if pip_runner is None:
-            pip_runner = PipRunner(python_exe=None, pip=SubprocessPip(osutils))
+            pip_runner = PipRunner(python_exe=python_exe, pip=SubprocessPip(osutils))
         self._pip = pip_runner
         self.runtime = runtime
         self.architecture = architecture
@@ -364,7 +364,10 @@ class DependencyBuilder(object):
         # which will serve as the primary list of dependencies needed to deploy
         # successfully.
         self._pip.download_all_dependencies(requirements_filename, directory)
-        deps = {Package(directory, filename) for filename in self._osutils.get_directory_contents(directory)}
+        deps = {
+            Package(directory, filename, self.python_exe)
+            for filename in self._osutils.get_directory_contents(directory)
+        }
         LOG.debug("Full dependency closure: %s", deps)
         return deps
 
@@ -383,7 +386,7 @@ class DependencyBuilder(object):
 
     def _categorize_wheel_files(self, directory):
         final_wheels = [
-            Package(directory, filename)
+            Package(directory, filename, self.python_exe)
             for filename in self._osutils.get_directory_contents(directory)
             if filename.endswith(".whl")
         ]
@@ -506,13 +509,14 @@ class DependencyBuilder(object):
 class Package(object):
     """A class to represent a package downloaded but not yet installed."""
 
-    def __init__(self, directory, filename, osutils=None):
+    def __init__(self, directory, filename, python_exe, osutils=None):
         self.dist_type = "wheel" if filename.endswith(".whl") else "sdist"
         self._directory = directory
         self.filename = filename
         if osutils is None:
             osutils = OSUtils()
         self._osutils = osutils
+        self.python_exe = python_exe
         self._name, self._version = self._calculate_name_and_version()
 
     @property
@@ -553,7 +557,7 @@ class Package(object):
             # {platform tag}.whl
             name, version = self.filename.split("-")[:2]
         else:
-            info_fetcher = SDistMetadataFetcher(osutils=self._osutils)
+            info_fetcher = SDistMetadataFetcher(self.python_exe, osutils=self._osutils)
             sdist_path = self._osutils.joinpath(self._directory, self.filename)
             name, version = info_fetcher.get_package_name_and_version(sdist_path)
         normalized_name = self._normalize_name(name)
@@ -572,10 +576,11 @@ class SDistMetadataFetcher(object):
         "exec(compile(code, __file__, 'exec'))"
     )
 
-    def __init__(self, osutils=None):
+    def __init__(self, python_exe, osutils=None):
         if osutils is None:
             osutils = OSUtils()
         self._osutils = osutils
+        self.python_exe = python_exe
 
     def _parse_pkg_info_file(self, filepath):
         # The PKG-INFO generated by the egg-info command is in an email feed
@@ -590,7 +595,7 @@ class SDistMetadataFetcher(object):
         setup_py = self._osutils.joinpath(package_dir, "setup.py")
         script = self._SETUPTOOLS_SHIM % setup_py
 
-        cmd = [sys.executable, "-c", script, "--no-user-cfg", "egg_info", "--egg-base", "egg-info"]
+        cmd = [self.python_exe, "-c", script, "--no-user-cfg", "egg_info", "--egg-base", "egg-info"]
         egg_info_dir = self._osutils.joinpath(package_dir, "egg-info")
         self._osutils.makedirs(egg_info_dir)
         p = subprocess.Popen(

{aws_lambda_builders-1.42.0 → aws_lambda_builders-1.44.0}/aws_lambda_builders.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aws-lambda-builders
-Version: 1.42.0
+Version: 1.44.0
 Summary: Python library to compile, build & package AWS Lambda functions for several runtimes & frameworks.
 Home-page: https://github.com/awslabs/aws-lambda-builders
 Author: Amazon Web Services
@@ -25,9 +25,23 @@ Classifier: Topic :: Internet
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Topic :: Utilities
 Requires-Python: >=3.7
-Provides-Extra: dev
 License-File: LICENSE
 License-File: NOTICE
+Requires-Dist: setuptools
+Requires-Dist: wheel
+Provides-Extra: dev
+Requires-Dist: coverage==7.2.7; python_version < "3.8" and extra == "dev"
+Requires-Dist: coverage==7.3.2; python_version >= "3.8" and extra == "dev"
+Requires-Dist: flake8==3.3.0; python_version < "3.8" and extra == "dev"
+Requires-Dist: flake8==3.8.4; python_version >= "3.8" and extra == "dev"
+Requires-Dist: pytest-cov==4.1.0; extra == "dev"
+Requires-Dist: isort<5,>=4.2.5; python_version < "3.8" and extra == "dev"
+Requires-Dist: pytest>=6.1.1; extra == "dev"
+Requires-Dist: parameterized==0.9.0; extra == "dev"
+Requires-Dist: pyelftools~=0.30; extra == "dev"
+Requires-Dist: black==22.6.0; python_version < "3.8" and extra == "dev"
+Requires-Dist: black==23.11.0; python_version >= "3.8" and extra == "dev"
+Requires-Dist: ruff==0.1.7; extra == "dev"
 
 ## Lambda Builders
 

{aws_lambda_builders-1.42.0 → aws_lambda_builders-1.44.0}/aws_lambda_builders.egg-info/requires.txt

@@ -6,7 +6,7 @@ pytest-cov==4.1.0
 pytest>=6.1.1
 parameterized==0.9.0
 pyelftools~=0.30
-ruff==0.1.4
+ruff==0.1.7
 
 [dev:python_version < "3.8"]
 coverage==7.2.7
@@ -17,4 +17,4 @@ black==22.6.0
 [dev:python_version >= "3.8"]
 coverage==7.3.2
 flake8==3.8.4
-black==23.10.1
+black==23.11.0

{aws_lambda_builders-1.42.0 → aws_lambda_builders-1.44.0}/requirements/dev.txt

@@ -13,5 +13,5 @@ pyelftools~=0.30 # Used to verify the generated Go binary architecture in integr
 
 # formatter
 black==22.6.0; python_version < "3.8"
-black==23.10.1; python_version >= "3.8"
-ruff==0.1.4
+black==23.11.0; python_version >= "3.8"
+ruff==0.1.7