aws-lambda-builders 1.35.0__tar.gz → 1.36.0__tar.gz

{aws_lambda_builders-1.35.0 → aws_lambda_builders-1.36.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aws_lambda_builders
-Version: 1.35.0
+Version: 1.36.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

{aws_lambda_builders-1.35.0 → aws_lambda_builders-1.36.0}/aws_lambda_builders/__init__.py

@@ -4,5 +4,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.35.0"
+__version__ = "1.36.0"
 RPC_PROTOCOL_VERSION = "0.3"

{aws_lambda_builders-1.35.0 → aws_lambda_builders-1.36.0}/aws_lambda_builders/workflows/python_pip/packager.py

@@ -7,6 +7,7 @@ import re
 import subprocess
 import sys
 from email.parser import FeedParser
+from typing import Tuple
 
 from aws_lambda_builders.architecture import ARM64, X86_64
 from aws_lambda_builders.utils import extract_tarfile
@@ -603,12 +604,30 @@ class SDistMetadataFetcher(object):
             # This might be a pep 517 package in which case this PKG-INFO file
             # should be available right in the top level directory of the sdist
             # in the case where the egg_info command fails.
-            LOG.debug("Using fallback location for PKG-INFO file in package directory: %s", package_dir)
-            pkg_info_path = self._osutils.joinpath(package_dir, "PKG-INFO")
+            pkg_info_path = self._get_fallback_pkg_info_filepath(package_dir)
         if not self._osutils.file_exists(pkg_info_path):
             raise UnsupportedPackageError(self._osutils.basename(package_dir))
         return pkg_info_path
 
+    def _get_fallback_pkg_info_filepath(self, package_dir: str) -> str:
+        """
+        Gets the string path of the fallback PKG-INFO that is generated by pip
+
+        Parameters
+        ----------
+        package_dir: str
+            The path of the current working directory that has the package
+
+        Returns
+        -------
+        str
+            Path to a potential PKG-INFO
+        """
+        LOG.debug("Using fallback location for PKG-INFO file in package directory: %s", package_dir)
+        pkg_info_path = self._osutils.joinpath(package_dir, "PKG-INFO")
+
+        return pkg_info_path
+
     def _unpack_sdist_into_dir(self, sdist_path, unpack_dir):
         if sdist_path.endswith(".zip"):
             self._osutils.extract_zipfile(sdist_path, unpack_dir)
@@ -620,13 +639,79 @@ class SDistMetadataFetcher(object):
         contents = self._osutils.get_directory_contents(unpack_dir)
         return self._osutils.joinpath(unpack_dir, contents[0])
 
-    def get_package_name_and_version(self, sdist_path):
+    def _get_name_version(self, pkg_info_filepath: str) -> Tuple[str, str]:
+        """
+        Extracts the name and the version from the PKG-INFO metadata file
+
+        Parameters
+        ----------
+        pkg_info_filepath: str
+            The path to the PKG-INFO file to get data from
+
+        Returns
+        -------
+        Tuple[str, str]
+            A tuple containing the name and version
+        """
+        metadata = self._parse_pkg_info_file(pkg_info_filepath)
+        return (metadata["Name"], metadata["Version"])
+
+    def _is_default_setuptools_values(self, name: str, version: str) -> bool:
+        """
+        Checks if the name or the version are the default values that are assigned by setuptools
+
+        Parameters
+        ----------
+        name: str
+            The name of the package
+        version: str
+            The version of the package as a string
+
+        Returns
+        -------
+        bool
+            True if either name or version are the default values
+        """
+        # default values logic:
+        # https://github.com/pypa/setuptools/blob/6083e18f4afc40316c0112134c205c336afbcdfd/setuptools/_distutils/dist.py#L1185-L1189
+        return name.lower() == "unknown" or version == "0.0.0"
+
+    def get_package_name_and_version(self, sdist_path: str) -> Tuple[str, str]:
+        """
+        Gets the package's name and version from the metadata file
+
+        Parameters
+        ----------
+        sdist_path: str
+            The string path of the downloaded source distribution artifact
+
+        Returns
+        -------
+        Tuple[str, str]
+            A tuple of the name and version of the package
+        """
         with self._osutils.tempdir() as tempdir:
             package_dir = self._unpack_sdist_into_dir(sdist_path, tempdir)
+
+            # get the name and version from the result setup.py
             pkg_info_filepath = self._get_pkg_info_filepath(package_dir)
-            metadata = self._parse_pkg_info_file(pkg_info_filepath)
-            name = metadata["Name"]
-            version = metadata["Version"]
+            name, version = self._get_name_version(pkg_info_filepath)
+
+            # return values if it is not the default values
+            if not self._is_default_setuptools_values(name, version):
+                return name, version
+
+            # see if we can get the fallback PKG_INFO file from the sdist
+            fallback_pkg_info_fp = self._get_fallback_pkg_info_filepath(package_dir)
+
+            if self._osutils.file_exists(fallback_pkg_info_fp):
+                # use the fallback values instead of the ones we generated
+                fallback_name, fallback_version = self._get_name_version(fallback_pkg_info_fp)
+
+                if not self._is_default_setuptools_values(fallback_name, fallback_version):
+                    name = fallback_name
+                    version = fallback_version
+
         return name, version
 
 

{aws_lambda_builders-1.35.0 → aws_lambda_builders-1.36.0}/aws_lambda_builders.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aws-lambda-builders
-Version: 1.35.0
+Version: 1.36.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

{aws_lambda_builders-1.35.0 → aws_lambda_builders-1.36.0}/aws_lambda_builders.egg-info/requires.txt

@@ -8,7 +8,7 @@ pytest>=6.1.1
 parameterized==0.9.0
 pyelftools~=0.29
 black==23.3.0
-ruff==0.0.277
+ruff==0.0.278
 
 [dev:python_version < "3.8"]
 flake8==3.3.0

{aws_lambda_builders-1.35.0 → aws_lambda_builders-1.36.0}/requirements/dev.txt

@@ -12,4 +12,4 @@ pyelftools~=0.29 # Used to verify the generated Go binary architecture in integr
 
 # formatter
 black==23.3.0
-ruff==0.0.277
+ruff==0.0.278