aws-lambda-builders 1.43.0__tar.gz → 1.45.0__tar.gz

{aws_lambda_builders-1.43.0 → aws_lambda_builders-1.45.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aws_lambda_builders
-Version: 1.43.0
+Version: 1.45.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.43.0 → aws_lambda_builders-1.45.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.43.0"
+__version__ = "1.45.0"
 RPC_PROTOCOL_VERSION = "0.3"

{aws_lambda_builders-1.43.0 → aws_lambda_builders-1.45.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.43.0 → aws_lambda_builders-1.45.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(
@@ -767,12 +772,14 @@ class PipRunner(object):
         main_args = [command] + args
         LOG.debug("calling pip %s", " ".join(main_args))
         rc, out, err = self._wrapped_pip.main(main_args, env_vars=env_vars, shim=shim)
+        LOG.debug("pip stdout: %s", out)
+        LOG.debug("pip stderr: %s", err)
         return rc, out, err
 
     def build_wheel(self, wheel, directory, compile_c=True):
         """Build an sdist into a wheel file."""
         arguments = ["--no-deps", "--wheel-dir", directory, wheel]
-        env_vars = self._osutils.environ()
+        env_vars = self._osutils.original_environ()
         shim = ""
         if not compile_c:
             env_vars.update(pip_no_compile_c_env_vars)

{aws_lambda_builders-1.43.0 → aws_lambda_builders-1.45.0}/aws_lambda_builders/workflows/python_pip/utils.py

@@ -16,9 +16,6 @@ EXPERIMENTAL_FLAG_BUILD_PERFORMANCE = "experimentalBuildPerformance"
 
 
 class OSUtils(object):
-    def environ(self):
-        return os.environ
-
     def original_environ(self):
         # https://pyinstaller.readthedocs.io/en/stable/runtime-information.html#ld-library-path-libpath-considerations
         env = dict(os.environ)

{aws_lambda_builders-1.43.0 → aws_lambda_builders-1.45.0}/aws_lambda_builders.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
-Name: aws-lambda-builders
-Version: 1.43.0
+Name: aws_lambda_builders
+Version: 1.45.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.43.0 → aws_lambda_builders-1.45.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.5
+ruff==0.1.7
 
 [dev:python_version < "3.8"]
 coverage==7.2.7

{aws_lambda_builders-1.43.0 → aws_lambda_builders-1.45.0}/requirements/dev.txt

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