aws-lambda-builders 1.57.0__tar.gz → 1.59.0__tar.gz

{aws_lambda_builders-1.57.0/aws_lambda_builders.egg-info → aws_lambda_builders-1.59.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aws_lambda_builders
-Version: 1.57.0
+Version: 1.59.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
@@ -21,6 +21,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Internet
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Topic :: Utilities
@@ -30,15 +31,15 @@ License-File: NOTICE
 Requires-Dist: setuptools
 Requires-Dist: wheel
 Provides-Extra: dev
-Requires-Dist: coverage==7.9.2; python_version >= "3.9" and extra == "dev"
+Requires-Dist: coverage==7.10.7; python_version >= "3.9" and extra == "dev"
 Requires-Dist: coverage==7.6.1; python_version < "3.9" and extra == "dev"
 Requires-Dist: flake8==3.8.4; extra == "dev"
-Requires-Dist: pytest-cov==6.2.1; python_version >= "3.9" and extra == "dev"
+Requires-Dist: pytest-cov==6.3.0; python_version >= "3.9" and extra == "dev"
 Requires-Dist: pytest-cov==5.0.0; python_version < "3.9" and extra == "dev"
 Requires-Dist: pytest>=6.1.1; extra == "dev"
 Requires-Dist: parameterized==0.9.0; extra == "dev"
 Requires-Dist: pyelftools~=0.32; extra == "dev"
-Requires-Dist: black==25.1.0; python_version >= "3.9" and extra == "dev"
+Requires-Dist: black==25.9.0; python_version >= "3.9" and extra == "dev"
 Requires-Dist: black==24.8.0; python_version < "3.9" and extra == "dev"
 Requires-Dist: ruff==0.11.13; extra == "dev"
 Dynamic: author

{aws_lambda_builders-1.57.0 → aws_lambda_builders-1.59.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.57.0"
+__version__ = "1.59.0"
 RPC_PROTOCOL_VERSION = "0.3"

{aws_lambda_builders-1.57.0 → aws_lambda_builders-1.59.0}/aws_lambda_builders/builder.py

@@ -105,7 +105,7 @@ class LambdaBuilder(object):
 
         :type options: dict
         :param options:
-            Optional dictionary of options ot pass to build action. **Not supported**.
+            Optional dictionary of options to pass to build action.
 
         :type executable_search_paths: list
         :param executable_search_paths:

{aws_lambda_builders-1.57.0 → aws_lambda_builders-1.59.0}/aws_lambda_builders/validator.py

@@ -20,6 +20,7 @@ SUPPORTED_RUNTIMES = {
     "python3.11": [ARM64, X86_64],
     "python3.12": [ARM64, X86_64],
     "python3.13": [ARM64, X86_64],
+    "python3.14": [ARM64, X86_64],
     "ruby3.2": [ARM64, X86_64],
     "ruby3.3": [ARM64, X86_64],
     "ruby3.4": [ARM64, X86_64],
@@ -27,6 +28,7 @@ SUPPORTED_RUNTIMES = {
     "java11": [ARM64, X86_64],
     "java17": [ARM64, X86_64],
     "java21": [ARM64, X86_64],
+    "java25": [ARM64, X86_64],
     "go1.x": [ARM64, X86_64],
     "dotnet6": [ARM64, X86_64],
     "dotnet8": [ARM64, X86_64],

{aws_lambda_builders-1.57.0 → aws_lambda_builders-1.59.0}/aws_lambda_builders/workflow.py

@@ -227,7 +227,7 @@ class BaseWorkflow(object, metaclass=_WorkflowMetaClass):
         optimizations : dict, optional
             dictionary of optimization flags to pass to the build action. **Not supported**, by default None
         options : dict, optional
-            dictionary of options ot pass to build action. **Not supported**., by default None
+            dictionary of options to pass to build action. By default None
         mode : str, optional
             Mode the build should produce, by default BuildMode.RELEASE
         download_dependencies: bool, optional

{aws_lambda_builders-1.57.0 → aws_lambda_builders-1.59.0}/aws_lambda_builders/workflows/python_pip/DESIGN.md

@@ -49,7 +49,7 @@ def build_dependencies(artifacts_dir_path,
 
     :type runtime: str
     :param runtime: Python version to build dependencies for. This can
-        either be python3.8, python3.9, python3.10, python3.11, python3.12 or python3.13. These are
+        either be python3.8, python3.9, python3.10, python3.11, python3.12, python3.13 or python3.14. These are
         currently the only supported values.
 
     :type ui: :class:`lambda_builders.actions.python_pip.utils.UI`
@@ -147,3 +147,47 @@ bundle has an `__init__.py` and is on the `PYTHONPATH`.
 The dependencies should now be succesfully installed in the target directory.
 All the temporary/intermediate files can now be deleting including all the
 wheel files and sdists.
+
+### Configuring the builder
+
+The Lambda builder supports the following optional sub-properties of the `aws_sam` configuration property.
+
+#### `parent_python_packages`
+
+`parent_python_packages` must be a string, corresponding to a dot-separated list of parent packages to create in the destination directory. This is useful when the source code has a package structure that needs to be preserved in the built artifacts.
+
+For example, if your source code is structured like this:
+
+```
+├── app
+|   ├── main.py
+|   └── utils
+|       └── logger.py
+└── tests
+    └── unit/test_handler.py
+```
+
+Then the SAM build output will look like this:
+
+```
+└── .aws-sam
+    └── build
+       └── AppLogicalId
+          ├── main.py
+          └── utils
+                └── logger.py
+```
+
+The tests would break because `main.py` is importing `logger` as `from .utils import logger`, but the built artifacts would not have the `app` package.
+
+To fix this, you can set the `parent_python_packages` property to `app` and the SAM build output will look like this:
+
+```
+└── .aws-sam
+    └── build
+       └── AppLogicalId
+          └── app
+              ├── main.py
+              └── utils
+                    └── logger.py
+```

{aws_lambda_builders-1.57.0 → aws_lambda_builders-1.59.0}/aws_lambda_builders/workflows/python_pip/actions.py

@@ -3,6 +3,7 @@ Action to resolve Python dependencies using PIP
 """
 
 import logging
+from pathlib import Path
 from typing import Optional, Tuple
 
 from aws_lambda_builders.actions import ActionFailedError, BaseAction, Purpose
@@ -21,6 +22,8 @@ from aws_lambda_builders.workflows.python_pip.utils import OSUtils
 
 LOG = logging.getLogger(__name__)
 
+PARENT_PYTHON_PKGS_KEY = "parent_python_packages"
+
 
 class PythonPipBuildAction(BaseAction):
     NAME = "ResolveDependencies"
@@ -115,3 +118,49 @@ class PythonPipBuildAction(BaseAction):
                 LOG.debug(f"Python runtime path '{python_path}' does not contain pip")
 
         raise ActionFailedError("Failed to find a Python runtime containing pip on the PATH.")
+
+
+class PythonCreateParentPackagesAction(BaseAction):
+    NAME = "CreateParentPackages"
+    DESCRIPTION = "Creating parent Python packages"
+    PURPOSE = Purpose.COPY_SOURCE
+    LANGUAGE = "python"
+
+    def __init__(self, source_dir, dest_dir, options=None):
+        self.source_dir = source_dir
+        self.dest_dir = dest_dir
+        self.options = options or {}
+
+    def execute(self):
+        pkg_parts = self._get_parent_python_packages()
+        if not pkg_parts:
+            return
+
+        source_path = Path(self.source_dir)
+        dest_path = Path(self.dest_dir)
+
+        target_pkg_path = dest_path.joinpath(*pkg_parts)
+        try:
+            target_pkg_path.mkdir(parents=True, exist_ok=False)
+        except FileExistsError:
+            LOG.warning("Skipping creating package %s as it would overwrite existing folder", target_pkg_path)
+            return
+
+        for item in source_path.glob(pattern="*"):
+            if (dest_path / item.name).exists():
+                (dest_path / item.name).rename(target_pkg_path / item.name)
+            else:
+                LOG.debug(f"{item} does not exist in the build path, skipping.")
+
+    def _get_parent_python_packages(self) -> Optional[list]:
+        """
+        Returns the parent Python packages to be created.
+        """
+        if not isinstance(self.options, dict):
+            return None
+
+        parent_python_pkgs = self.options.get(PARENT_PYTHON_PKGS_KEY)
+        if isinstance(parent_python_pkgs, str) and len(parent_python_pkgs) > 0:
+            return parent_python_pkgs.split(".")
+
+        return None

{aws_lambda_builders-1.57.0 → aws_lambda_builders-1.59.0}/aws_lambda_builders/workflows/python_pip/packager.py

@@ -88,6 +88,7 @@ def get_lambda_abi(runtime):
         "python3.11": "cp311",
         "python3.12": "cp312",
         "python3.13": "cp313",
+        "python3.14": "cp314",
     }
 
     if runtime not in supported:
@@ -102,8 +103,8 @@ class PythonPipDependencyBuilder(object):
 
         :type runtime: str
         :param runtime: Python version to build dependencies for. This can
-            either be python3.8, python3.9, python3.10, python3.11, python3.12 or python3.13. These are currently the
-            only supported values.
+            either be python3.8, python3.9, python3.10, python3.11, python3.12, python3.13 or python3.14.
+            These are currently the only supported values.
 
         :type osutils: :class:`lambda_builders.utils.OSUtils`
         :param osutils: A class used for all interactions with the
@@ -215,6 +216,7 @@ class DependencyBuilder(object):
         "cp311": (2, 26),
         "cp312": (2, 34),
         "cp313": (2, 34),
+        "cp314": (2, 34),
     }
     # Fallback version if we're on an unknown python version
     # not in _RUNTIME_GLIBC.
@@ -664,8 +666,22 @@ class SDistMetadataFetcher(object):
 
     def _get_pkg_info_filepath(self, package_dir):
         setup_py = self._osutils.joinpath(package_dir, "setup.py")
-        script = self._SETUPTOOLS_SHIM % setup_py
 
+        # First, try to ensure setuptools is available for the subprocess
+        # In Python 3.12+, setuptools might not be available by default
+        try:
+            # Check if setuptools is available in the current environment
+            check_cmd = [self.python_exe, "-c", "import setuptools"]
+            result = subprocess.run(check_cmd, capture_output=True, timeout=10, check=False)
+            if result.returncode != 0:
+                LOG.debug(
+                    "setuptools not available in Python environment. "
+                    "PKG-INFO fallback will be used if setup.py fails."
+                )
+        except Exception as e:
+            LOG.debug("Could not check setuptools availability: %s", e)
+
+        script = self._SETUPTOOLS_SHIM % setup_py
         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)
@@ -676,6 +692,13 @@ class SDistMetadataFetcher(object):
         info_contents = self._osutils.get_directory_contents(egg_info_dir)
         if p.returncode != 0:
             LOG.debug("Non zero rc (%s) from the setup.py egg_info command: %s", p.returncode, stderr)
+            # Check if the error is due to missing setuptools/distutils in Python 3.12+
+            if b"setuptools" in stderr or b"distutils" in stderr:
+                LOG.debug(
+                    "Setup.py failed likely due to missing setuptools/distutils in Python 3.12+. "
+                    "Trying fallback PKG-INFO."
+                )
+
         if info_contents:
             pkg_info_path = self._osutils.joinpath(egg_info_dir, info_contents[0], "PKG-INFO")
         else:
@@ -683,8 +706,34 @@ class SDistMetadataFetcher(object):
             # should be available right in the top level directory of the sdist
             # in the case where the egg_info command fails.
             pkg_info_path = self._get_fallback_pkg_info_filepath(package_dir)
+            LOG.debug("Using fallback PKG-INFO path: %s", pkg_info_path)
+
         if not self._osutils.file_exists(pkg_info_path):
-            raise UnsupportedPackageError(self._osutils.basename(package_dir))
+            LOG.debug("PKG-INFO file not found at: %s", pkg_info_path)
+
+            # Look for any .egg-info directories that might already exist
+            try:
+                package_contents = self._osutils.get_directory_contents(package_dir)
+                for item in package_contents:
+                    if item.endswith(".egg-info") and self._osutils.directory_exists(
+                        self._osutils.joinpath(package_dir, item)
+                    ):
+                        potential_pkg_info = self._osutils.joinpath(package_dir, item, "PKG-INFO")
+                        if self._osutils.file_exists(potential_pkg_info):
+                            LOG.debug("Found PKG-INFO in existing .egg-info directory: %s", potential_pkg_info)
+                            pkg_info_path = potential_pkg_info
+                            break
+            except Exception as e:
+                LOG.debug("Error while searching for existing .egg-info directories: %s", e)
+
+            if not self._osutils.file_exists(pkg_info_path):
+                LOG.warning(
+                    "Unable to find PKG-INFO file for package in %s. "
+                    "This may be due to missing setuptools/distutils in Python 3.12+ "
+                    "or an incomplete sdist package.",
+                    package_dir,
+                )
+                raise UnsupportedPackageError(self._osutils.basename(package_dir))
         return pkg_info_path
 
     def _get_fallback_pkg_info_filepath(self, package_dir: str) -> str:

{aws_lambda_builders-1.57.0 → aws_lambda_builders-1.59.0}/aws_lambda_builders/workflows/python_pip/workflow.py

@@ -9,7 +9,7 @@ from aws_lambda_builders.path_resolver import PathResolver
 from aws_lambda_builders.workflow import BaseWorkflow, BuildDirectory, BuildInSourceSupport, Capability
 from aws_lambda_builders.workflows.python_pip.validator import PythonRuntimeValidator
 
-from .actions import PythonPipBuildAction
+from .actions import PARENT_PYTHON_PKGS_KEY, PythonCreateParentPackagesAction, PythonPipBuildAction
 from .utils import OSUtils, is_experimental_build_improvements_enabled
 
 LOG = logging.getLogger(__name__)
@@ -87,15 +87,15 @@ class PythonPipWorkflow(BaseWorkflow):
         self.actions = []
         if not osutils.file_exists(manifest_path):
             LOG.warning("requirements.txt file not found. Continuing the build without dependencies.")
-            self.actions.append(CopySourceAction(source_dir, artifacts_dir, excludes=self.EXCLUDED_FILES))
+            self._actions.append(CopySourceAction(source_dir, artifacts_dir, excludes=self.EXCLUDED_FILES))
             return
 
         # If a requirements.txt exists, run pip builder before copy action.
         if self.download_dependencies:
             if self.dependencies_dir:
                 # clean up the dependencies folder before installing
-                self.actions.append(CleanUpAction(self.dependencies_dir))
-            self.actions.append(
+                self._actions.append(CleanUpAction(self.dependencies_dir))
+            self._actions.append(
                 PythonPipBuildAction(
                     artifacts_dir,
                     scratch_dir,
@@ -113,11 +113,25 @@ class PythonPipWorkflow(BaseWorkflow):
             # when copying downloaded dependencies back to artifacts folder, don't exclude anything
             # symlinking python dependencies is disabled for now since it is breaking sam local commands
             if False and is_experimental_build_improvements_enabled(self.experimental_flags):
-                self.actions.append(LinkSourceAction(self.dependencies_dir, artifacts_dir))
+                self._actions.append(LinkSourceAction(self.dependencies_dir, artifacts_dir))
             else:
-                self.actions.append(CopySourceAction(self.dependencies_dir, artifacts_dir))
+                self._actions.append(CopySourceAction(self.dependencies_dir, artifacts_dir))
 
-        self.actions.append(CopySourceAction(source_dir, artifacts_dir, excludes=self.EXCLUDED_FILES))
+        self._actions.append(CopySourceAction(source_dir, artifacts_dir, excludes=self.EXCLUDED_FILES))
+
+    @property
+    def actions(self):
+        """
+        Returns the list of actions to be executed in this workflow.
+        If required, creating the parent package(s) must be executed last.
+        """
+        if self._should_create_parent_packages():
+            return self._actions + [PythonCreateParentPackagesAction(self.source_dir, self.artifacts_dir, self.options)]
+        return self._actions
+
+    @actions.setter
+    def actions(self, value):
+        self._actions = value
 
     def get_resolvers(self):
         """
@@ -138,5 +152,13 @@ class PythonPipWorkflow(BaseWorkflow):
         major, _ = self.runtime.replace(self.CAPABILITY.language, "").split(".")
         return [f"{self.CAPABILITY.language}{major}"] if major == self.PYTHON_VERSION_THREE else None
 
+    def _should_create_parent_packages(self):
+        """
+        Determines if the parent package(s) should be created based on the options provided.
+        """
+        if isinstance(self.options, dict):
+            return PARENT_PYTHON_PKGS_KEY in self.options
+        return False
+
     def get_validators(self):
         return [PythonRuntimeValidator(runtime=self.runtime, architecture=self.architecture)]

{aws_lambda_builders-1.57.0 → aws_lambda_builders-1.59.0/aws_lambda_builders.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aws_lambda_builders
-Version: 1.57.0
+Version: 1.59.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
@@ -21,6 +21,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Internet
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Topic :: Utilities
@@ -30,15 +31,15 @@ License-File: NOTICE
 Requires-Dist: setuptools
 Requires-Dist: wheel
 Provides-Extra: dev
-Requires-Dist: coverage==7.9.2; python_version >= "3.9" and extra == "dev"
+Requires-Dist: coverage==7.10.7; python_version >= "3.9" and extra == "dev"
 Requires-Dist: coverage==7.6.1; python_version < "3.9" and extra == "dev"
 Requires-Dist: flake8==3.8.4; extra == "dev"
-Requires-Dist: pytest-cov==6.2.1; python_version >= "3.9" and extra == "dev"
+Requires-Dist: pytest-cov==6.3.0; python_version >= "3.9" and extra == "dev"
 Requires-Dist: pytest-cov==5.0.0; python_version < "3.9" and extra == "dev"
 Requires-Dist: pytest>=6.1.1; extra == "dev"
 Requires-Dist: parameterized==0.9.0; extra == "dev"
 Requires-Dist: pyelftools~=0.32; extra == "dev"
-Requires-Dist: black==25.1.0; python_version >= "3.9" and extra == "dev"
+Requires-Dist: black==25.9.0; python_version >= "3.9" and extra == "dev"
 Requires-Dist: black==24.8.0; python_version < "3.9" and extra == "dev"
 Requires-Dist: ruff==0.11.13; extra == "dev"
 Dynamic: author

{aws_lambda_builders-1.57.0 → aws_lambda_builders-1.59.0}/aws_lambda_builders.egg-info/requires.txt

@@ -14,6 +14,6 @@ pytest-cov==5.0.0
 black==24.8.0
 
 [dev:python_version >= "3.9"]
-coverage==7.9.2
-pytest-cov==6.2.1
-black==25.1.0
+coverage==7.10.7
+pytest-cov==6.3.0
+black==25.9.0

{aws_lambda_builders-1.57.0 → aws_lambda_builders-1.59.0}/pyproject.toml

@@ -9,7 +9,7 @@ select = [
   "PL", # pylint
   "I",  # isort
 ]
-ignore = ["PLR0913"]
+ignore = ["PLR0913", "PLC0415"]
 
 [tool.ruff.lint.pylint]
 max-branches = 13

{aws_lambda_builders-1.57.0 → aws_lambda_builders-1.59.0}/requirements/dev.txt

@@ -1,7 +1,7 @@
-coverage==7.9.2; python_version>="3.9"
+coverage==7.10.7; python_version>="3.9"
 coverage==7.6.1; python_version<"3.9"
 flake8==3.8.4
-pytest-cov==6.2.1; python_version>="3.9"
+pytest-cov==6.3.0; python_version>="3.9"
 pytest-cov==5.0.0; python_version<"3.9"
 
 # Test requirements
@@ -10,6 +10,6 @@ parameterized==0.9.0
 pyelftools~=0.32 # Used to verify the generated Go binary architecture in integration tests (utils.py)
 
 # formatter
-black==25.1.0; python_version>="3.9"
+black==25.9.0; python_version>="3.9"
 black==24.8.0; python_version<"3.9"
 ruff==0.11.13

{aws_lambda_builders-1.57.0 → aws_lambda_builders-1.59.0}/setup.py

@@ -64,6 +64,7 @@ setup(
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: 3.13",
+        "Programming Language :: Python :: 3.14",
         "Topic :: Internet",
         "Topic :: Software Development :: Build Tools",
         "Topic :: Utilities",