aws-lambda-builders 1.48.0__tar.gz → 1.50.0__tar.gz

{aws_lambda_builders-1.48.0/aws_lambda_builders.egg-info → aws_lambda_builders-1.50.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aws_lambda_builders
-Version: 1.48.0
+Version: 1.50.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
@@ -29,14 +29,14 @@ License-File: NOTICE
 Requires-Dist: setuptools
 Requires-Dist: wheel
 Provides-Extra: dev
-Requires-Dist: coverage==7.4.4; extra == "dev"
+Requires-Dist: coverage==7.5.1; extra == "dev"
 Requires-Dist: flake8==3.8.4; extra == "dev"
 Requires-Dist: pytest-cov==5.0.0; extra == "dev"
 Requires-Dist: pytest>=6.1.1; extra == "dev"
 Requires-Dist: parameterized==0.9.0; extra == "dev"
 Requires-Dist: pyelftools~=0.31; extra == "dev"
-Requires-Dist: black==24.3.0; extra == "dev"
-Requires-Dist: ruff==0.3.4; extra == "dev"
+Requires-Dist: black==24.4.2; extra == "dev"
+Requires-Dist: ruff==0.4.3; extra == "dev"
 
 ## Lambda Builders
 

{aws_lambda_builders-1.48.0 → aws_lambda_builders-1.50.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.48.0"
+__version__ = "1.50.0"
 RPC_PROTOCOL_VERSION = "0.3"

{aws_lambda_builders-1.48.0 → aws_lambda_builders-1.50.0}/aws_lambda_builders/builder.py

@@ -60,6 +60,7 @@ class LambdaBuilder(object):
         scratch_dir,
         manifest_path,
         runtime=None,
+        unpatched_runtime=None,
         optimizations=None,
         options=None,
         executable_search_paths=None,
@@ -154,6 +155,7 @@ class LambdaBuilder(object):
             scratch_dir,
             manifest_path,
             runtime=runtime,
+            unpatched_runtime=unpatched_runtime,
             optimizations=optimizations,
             options=options,
             executable_search_paths=executable_search_paths,

{aws_lambda_builders-1.48.0 → aws_lambda_builders-1.50.0}/aws_lambda_builders/workflow.py

@@ -201,6 +201,7 @@ class BaseWorkflow(object, metaclass=_WorkflowMetaClass):
         is_building_layer=False,
         experimental_flags=None,
         build_in_source=None,
+        unpatched_runtime=None,
     ):
         # pylint: disable-msg=too-many-locals
         """
@@ -263,6 +264,7 @@ class BaseWorkflow(object, metaclass=_WorkflowMetaClass):
         self.combine_dependencies = combine_dependencies
         self.architecture = architecture
         self.is_building_layer = is_building_layer
+        self.unpatched_runtime = unpatched_runtime
         self.experimental_flags = experimental_flags if experimental_flags else []
 
         # this represents where the build/install happens, not the final output directory (that's the artifacts_dir)

{aws_lambda_builders-1.48.0 → aws_lambda_builders-1.50.0}/aws_lambda_builders/workflows/python_pip/packager.py

@@ -203,6 +203,9 @@ class DependencyBuilder(object):
         "cp37m": (2, 17),
         "cp38": (2, 26),
         "cp39": (2, 26),
+        "cp310": (2, 26),
+        "cp311": (2, 26),
+        "cp312": (2, 26),
     }
     # Fallback version if we're on an unknown python version
     # not in _RUNTIME_GLIBC.

{aws_lambda_builders-1.48.0 → aws_lambda_builders-1.50.0}/aws_lambda_builders/workflows/rust_cargo/actions.py

@@ -26,6 +26,7 @@ class RustCargoLambdaBuildAction(BaseAction):
         binaries,
         mode,
         subprocess_cargo_lambda,
+        runtime=None,
         architecture=X86_64,
         handler=None,
         flags=None,
@@ -68,18 +69,27 @@ class RustCargoLambdaBuildAction(BaseAction):
         self._flags = flags
         self._architecture = architecture
         self._subprocess_cargo_lambda = subprocess_cargo_lambda
+        self._runtime = runtime
 
     def build_command(self):
         cmd = [self._binaries["cargo"].binary_path, "lambda", "build"]
         if self._mode != BuildMode.DEBUG:
             cmd.append("--release")
-        if self._architecture == ARM64:
+        # Provided.al2 runtime only has GLIB_2.26 and cargo lambda builds with a higher version by default
+        if self._runtime == "provided.al2":
+            if self._architecture == ARM64:
+                # We cant use the --arm shortcut because then the incorrect version of GLIBC is used
+                cmd.append("--target")
+                cmd.append("aarch64-unknown-linux-gnu.2.26")
+            if self._architecture == X86_64:
+                cmd.append("--target")
+                cmd.append("x86_64-unknown-linux-gnu.2.26")
+        elif self._architecture == ARM64:
             cmd.append("--arm64")
         if self._handler:
             cmd.extend(["--bin", self._handler])
         if self._flags:
             cmd.extend(self._flags)
-
         return cmd
 
     def execute(self):

{aws_lambda_builders-1.48.0 → aws_lambda_builders-1.50.0}/aws_lambda_builders/workflows/rust_cargo/cargo_lambda.py

@@ -100,6 +100,12 @@ class SubprocessCargoLambda(object):
             if "RUST_LOG" not in os.environ:
                 os.environ["RUST_LOG"] = "debug"
             LOG.debug("RUST_LOG environment variable set to `%s`", os.environ.get("RUST_LOG"))
+
+        if not os.getenv("CARGO_TARGET_DIR"):
+            # This results in the "target" dir being created under the member dir of a cargo workspace
+            # This is for supporting sam build for a Cargo Workspace project
+            os.environ["CARGO_TARGET_DIR"] = "target"
+
         cargo_process = self._osutils.popen(
             command,
             stderr=subprocess.PIPE,

{aws_lambda_builders-1.48.0 → aws_lambda_builders-1.50.0}/aws_lambda_builders/workflows/rust_cargo/workflow.py

@@ -22,7 +22,17 @@ class RustCargoLambdaWorkflow(BaseWorkflow):
 
     SUPPORTED_MANIFESTS = ["Cargo.toml"]
 
-    def __init__(self, source_dir, artifacts_dir, scratch_dir, manifest_path, runtime=None, mode=None, **kwargs):
+    def __init__(
+        self,
+        source_dir,
+        artifacts_dir,
+        scratch_dir,
+        manifest_path,
+        runtime=None,
+        unpatched_runtime=None,
+        mode=None,
+        **kwargs,
+    ):
         super(RustCargoLambdaWorkflow, self).__init__(
             source_dir, artifacts_dir, scratch_dir, manifest_path, runtime=runtime, **kwargs
         )
@@ -43,6 +53,7 @@ class RustCargoLambdaWorkflow(BaseWorkflow):
                 self.binaries,
                 mode,
                 subprocess_cargo_lambda,
+                unpatched_runtime,
                 self.architecture,
                 handler,
                 flags,

{aws_lambda_builders-1.48.0 → aws_lambda_builders-1.50.0/aws_lambda_builders.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aws_lambda_builders
-Version: 1.48.0
+Version: 1.50.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
@@ -29,14 +29,14 @@ License-File: NOTICE
 Requires-Dist: setuptools
 Requires-Dist: wheel
 Provides-Extra: dev
-Requires-Dist: coverage==7.4.4; extra == "dev"
+Requires-Dist: coverage==7.5.1; extra == "dev"
 Requires-Dist: flake8==3.8.4; extra == "dev"
 Requires-Dist: pytest-cov==5.0.0; extra == "dev"
 Requires-Dist: pytest>=6.1.1; extra == "dev"
 Requires-Dist: parameterized==0.9.0; extra == "dev"
 Requires-Dist: pyelftools~=0.31; extra == "dev"
-Requires-Dist: black==24.3.0; extra == "dev"
-Requires-Dist: ruff==0.3.4; extra == "dev"
+Requires-Dist: black==24.4.2; extra == "dev"
+Requires-Dist: ruff==0.4.3; extra == "dev"
 
 ## Lambda Builders
 

{aws_lambda_builders-1.48.0 → aws_lambda_builders-1.50.0}/aws_lambda_builders.egg-info/requires.txt

@@ -2,11 +2,11 @@ setuptools
 wheel
 
 [dev]
-coverage==7.4.4
+coverage==7.5.1
 flake8==3.8.4
 pytest-cov==5.0.0
 pytest>=6.1.1
 parameterized==0.9.0
 pyelftools~=0.31
-black==24.3.0
-ruff==0.3.4
+black==24.4.2
+ruff==0.4.3

{aws_lambda_builders-1.48.0 → aws_lambda_builders-1.50.0}/requirements/dev.txt

@@ -1,4 +1,4 @@
-coverage==7.4.4
+coverage==7.5.1
 flake8==3.8.4
 pytest-cov==5.0.0
 
@@ -8,5 +8,5 @@ parameterized==0.9.0
 pyelftools~=0.31 # Used to verify the generated Go binary architecture in integration tests (utils.py)
 
 # formatter
-black==24.3.0
-ruff==0.3.4
+black==24.4.2
+ruff==0.4.3