Merge branch 'develop'

aws-sam-cli-bot · aws-sam-cli-bot · commit b98cef7584d2 · 2024-11-07T19:14:04.000Z
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -123,6 +123,7 @@ jobs:
           - "3.10"
           - "3.11"
           - "3.12"
+          - "3.13"
         npm:
           - 8
           - 9
@@ -156,6 +157,7 @@ jobs:
           - "3.10"
           - "3.11"
           - "3.12"
+          - "3.13"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -183,6 +185,7 @@ jobs:
           - "3.10"
           - "3.11"
           - "3.12"
+          - "3.13"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -213,6 +216,7 @@ jobs:
           - "3.10"
           - "3.11"
           - "3.12"
+          - "3.13"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -265,6 +269,7 @@ jobs:
           - "3.10"
           - "3.11"
           - "3.12"
+          - "3.13"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -293,6 +298,7 @@ jobs:
           - "3.10"
           - "3.11"
           - "3.12"
+          - "3.13"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -320,6 +326,7 @@ jobs:
           - "3.10"
           - "3.11"
           - "3.12"
+          - "3.13"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
diff --git a/Makefile b/Makefile
@@ -17,8 +17,8 @@ integ-test:
 	LAMBDA_BUILDERS_DEV=1 pytest tests/integration
 
 lint:
-	# Liner performs static analysis to catch latent bugs
-	ruff aws_lambda_builders
+	# Linter performs static analysis to catch latent bugs
+	ruff check aws_lambda_builders
 
 lint-fix:
 	ruff aws_lambda_builders --fix
@@ -35,4 +35,4 @@ black-check:
 # Verifications to run before sending a pull request
 pr: init dev black-check
 
-format: lint-fix black
+format: lint-fix black
diff --git a/aws_lambda_builders/__init__.py b/aws_lambda_builders/__init__.py
@@ -5,5 +5,5 @@
 # Changing version will trigger a new release!
 # Please make the version change as the last step of your development.
 
-__version__ = "1.50.0"
+__version__ = "1.51.0"
 RPC_PROTOCOL_VERSION = "0.3"
diff --git a/aws_lambda_builders/validator.py b/aws_lambda_builders/validator.py
@@ -18,6 +18,7 @@
     "python3.10": [ARM64, X86_64],
     "python3.11": [ARM64, X86_64],
     "python3.12": [ARM64, X86_64],
+    "python3.13": [ARM64, X86_64],
     "ruby3.2": [ARM64, X86_64],
     "ruby3.3": [ARM64, X86_64],
     "java8": [ARM64, X86_64],
diff --git a/aws_lambda_builders/workflows/nodejs_npm/actions.py b/aws_lambda_builders/workflows/nodejs_npm/actions.py
@@ -108,7 +108,7 @@ def execute(self):
         :raises lambda_builders.actions.ActionFailedError: when NPM execution fails
         """
         try:
-            LOG.debug("NODEJS installing in: %s", self.install_dir)
+            LOG.debug("NODEJS installing production dependencies in: %s", self.install_dir)
 
             command = ["install", "-q", "--no-audit", "--no-save", "--unsafe-perm", "--production"]
             self.subprocess_npm.run(command, cwd=self.install_dir)
@@ -132,7 +132,7 @@ def execute(self):
         :raises lambda_builders.actions.ActionFailedError: when NPM execution fails
         """
         try:
-            LOG.debug("NODEJS updating in: %s", self.install_dir)
+            LOG.debug("NODEJS updating production dependencies in: %s", self.install_dir)
 
             command = [
                 "update",
diff --git a/aws_lambda_builders/workflows/nodejs_npm/workflow.py b/aws_lambda_builders/workflows/nodejs_npm/workflow.py
@@ -243,6 +243,11 @@ def get_install_action(
         if build_options and isinstance(build_options, dict):
             npm_ci_option = build_options.get("use_npm_ci", False)
 
+        LOG.debug(
+            "npm installation actions install only production dependencies. "
+            "Dev dependencies are omitted from the Lambda artifacts package"
+        )
+
         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=is_building_in_source
diff --git a/aws_lambda_builders/workflows/python_pip/DESIGN.md b/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 or python3.12. These are
+        either be python3.8, python3.9, python3.10, python3.11, python3.12 or python3.13. These are
         currently the only supported values.
 
     :type ui: :class:`lambda_builders.actions.python_pip.utils.UI`
diff --git a/aws_lambda_builders/workflows/python_pip/packager.py b/aws_lambda_builders/workflows/python_pip/packager.py
@@ -86,6 +86,7 @@ def get_lambda_abi(runtime):
         "python3.10": "cp310",
         "python3.11": "cp311",
         "python3.12": "cp312",
+        "python3.13": "cp313",
     }
 
     if runtime not in supported:
@@ -100,7 +101,7 @@ def __init__(self, runtime, python_exe, osutils=None, dependency_builder=None, a
 
         :type runtime: str
         :param runtime: Python version to build dependencies for. This can
-            either be python3.8, python3.9, python3.10, python3.11 or python3.12. These are currently the
+            either be python3.8, python3.9, python3.10, python3.11, python3.12 or python3.13. These are currently the
             only supported values.
 
         :type osutils: :class:`lambda_builders.utils.OSUtils`
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,18 +1,20 @@
 [tool.ruff]
 line-length = 120
 
+[tool.ruff.lint]
+
 select = [
-    "E",  # Pycodestyle
-    "F",  # Pyflakes
-    "PL", # pylint
-    "I",  # isort
+  "E",  # Pycodestyle
+  "F",  # Pyflakes
+  "PL", # pylint
+  "I",  # isort
 ]
 ignore = ["PLR0913"]
 
-[tool.ruff.pylint]
+[tool.ruff.lint.pylint]
 max-branches = 13
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["F401", "E501"]
 "aws_lambda_builders/workflow.py" = ["E501"]
 
@@ -32,4 +34,4 @@ exclude = '''
     | pip-wheel-metadata
   )/
 )
-'''
+'''
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -1,4 +1,5 @@
-coverage==7.5.1
+coverage==7.6.4; python_version>="3.9"
+coverage==7.6.1; python_version<"3.9"
 flake8==3.8.4
 pytest-cov==5.0.0
 
@@ -8,5 +9,6 @@ parameterized==0.9.0
 pyelftools~=0.31 # Used to verify the generated Go binary architecture in integration tests (utils.py)
 
 # formatter
-black==24.4.2
-ruff==0.4.3
+black==24.10.0; python_version>="3.9"
+black==24.8.0; python_version<"3.9"
+ruff==0.7.1
diff --git a/setup.py b/setup.py
@@ -63,6 +63,7 @@ def read_version():
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
         "Topic :: Internet",
         "Topic :: Software Development :: Build Tools",
         "Topic :: Utilities",
diff --git a/tests/integration/workflows/java_gradle/test_java_gradle.py b/tests/integration/workflows/java_gradle/test_java_gradle.py
@@ -1,6 +1,7 @@
 import os
 import shutil
 import tempfile
+import platform
 
 from unittest import TestCase
 from pathlib import Path
@@ -36,7 +37,18 @@ class TestJavaGradle(TestCase):
 
     def setUp(self):
         self.artifacts_dir = tempfile.mkdtemp()
-        self.scratch_dir = tempfile.mkdtemp()
+
+        scratch_folder_override = None
+        if platform.system().lower() == "windows" and os.getenv("GITHUB_ACTIONS"):
+            # lucashuy: there is some really odd behaviour where
+            # gradle will refuse to work it is run within
+            # the default TEMP folder location in Github Actions
+            #
+            # use the runner's home directory as a workaround
+            scratch_folder_override = os.getenv("userprofile")
+
+        self.scratch_dir = tempfile.mkdtemp(dir=scratch_folder_override)
+
         self.dependencies_dir = tempfile.mkdtemp()
         self.builder = LambdaBuilder(language="java", dependency_manager="gradle", application_framework=None)
 
diff --git a/tests/integration/workflows/python_pip/test_python_pip.py b/tests/integration/workflows/python_pip/test_python_pip.py
@@ -18,7 +18,7 @@
 logger = logging.getLogger("aws_lambda_builders.workflows.python_pip.workflow")
 IS_WINDOWS = platform.system().lower() == "windows"
 NOT_ARM = platform.processor() != "aarch64"
-ARM_RUNTIMES = {"python3.8", "python3.9", "python3.10", "python3.11", "python3.12"}
+ARM_RUNTIMES = {"python3.8", "python3.9", "python3.10", "python3.11", "python3.12", "python3.13"}
 
 
 @parameterized_class(("experimental_flags",), [([]), ([EXPERIMENTAL_FLAG_BUILD_PERFORMANCE])])
@@ -64,6 +64,7 @@ def setUp(self):
             "python3.10": "python3.9",
             "python3.11": "python3.10",
             "python3.12": "python3.11",
+            "python3.13": "python3.12",
         }
 
     def tearDown(self):
@@ -96,9 +97,9 @@ def test_must_build_python_project(self):
             experimental_flags=self.experimental_flags,
         )
 
-        if self.runtime in ("python3.12"):
-            self.check_architecture_in("numpy-1.26.1.dist-info", ["manylinux2014_x86_64", "manylinux1_x86_64"])
-            expected_files = self.test_data_files.union({"numpy", "numpy-1.26.1.dist-info", "numpy.libs"})
+        if self.runtime in ("python3.12", "python3.13"):
+            self.check_architecture_in("numpy-2.1.2.dist-info", ["manylinux2014_x86_64", "manylinux1_x86_64"])
+            expected_files = self.test_data_files.union({"numpy", "numpy-2.1.2.dist-info", "numpy.libs"})
         elif self.runtime in ("python3.10", "python3.11"):
             self.check_architecture_in("numpy-1.23.5.dist-info", ["manylinux2014_x86_64", "manylinux1_x86_64"])
             expected_files = self.test_data_files.union({"numpy", "numpy-1.23.5.dist-info", "numpy.libs"})
@@ -126,10 +127,10 @@ def test_must_build_python_project_python3_binary(self):
                 executable_search_paths=[executable_dir],
             )
 
-            if self.runtime in ("python3.12"):
-                self.check_architecture_in("numpy-1.26.1.dist-info", ["manylinux2014_x86_64", "manylinux1_x86_64"])
-                expected_files = self.test_data_files.union({"numpy", "numpy-1.26.1.dist-info", "numpy.libs"})
-            elif self.runtime in ("python3.10", "python3.11", "python3.12"):
+            if self.runtime in ("python3.12", "python3.13"):
+                self.check_architecture_in("numpy-2.1.2.dist-info", ["manylinux2014_x86_64", "manylinux1_x86_64"])
+                expected_files = self.test_data_files.union({"numpy", "numpy-2.1.2.dist-info", "numpy.libs"})
+            elif self.runtime in ("python3.10", "python3.11"):
                 self.check_architecture_in("numpy-1.23.5.dist-info", ["manylinux2014_x86_64", "manylinux1_x86_64"])
                 expected_files = self.test_data_files.union({"numpy", "numpy-1.23.5.dist-info", "numpy.libs"})
             else:
@@ -174,15 +175,15 @@ def test_must_build_python_project_with_arm_architecture(self):
             experimental_flags=self.experimental_flags,
         )
         expected_files = self.test_data_files.union({"numpy", "numpy.libs", "numpy-1.20.3.dist-info"})
-        if self.runtime in ("python3.12"):
-            expected_files = self.test_data_files.union({"numpy", "numpy.libs", "numpy-1.26.1.dist-info"})
+        if self.runtime in ("python3.12", "python3.13"):
+            expected_files = self.test_data_files.union({"numpy", "numpy.libs", "numpy-2.1.2.dist-info"})
         if self.runtime in ("python3.10", "python3.11"):
             expected_files = self.test_data_files.union({"numpy", "numpy.libs", "numpy-1.23.5.dist-info"})
         output_files = set(os.listdir(self.artifacts_dir))
         self.assertEqual(expected_files, output_files)
 
-        if self.runtime in ("python3.12"):
-            self.check_architecture_in("numpy-1.26.1.dist-info", ["manylinux2014_aarch64"])
+        if self.runtime in ("python3.12", "python3.13"):
+            self.check_architecture_in("numpy-2.1.2.dist-info", ["manylinux2014_aarch64"])
         elif self.runtime in ("python3.10", "python3.11"):
             self.check_architecture_in("numpy-1.23.5.dist-info", ["manylinux2014_aarch64"])
         else:
@@ -247,6 +248,8 @@ def test_must_resolve_local_dependency(self):
             self.assertIn(f, output_files)
 
     def test_must_resolve_unknown_package_name(self):
+        if IS_WINDOWS and self.runtime == "python3.13":
+            self.skipTest("Skip test as pip install inflate64 does not work on Windows with Python 3.13")
         self.builder.build(
             self.source_dir,
             self.artifacts_dir,
diff --git a/tests/integration/workflows/python_pip/testdata/requirements-numpy.txt b/tests/integration/workflows/python_pip/testdata/requirements-numpy.txt
@@ -2,4 +2,5 @@ numpy==1.20.3; python_version == '3.8'
 numpy==1.20.3; python_version == '3.9'
 numpy==1.23.5; python_version == '3.10'
 numpy==1.23.5; python_version == '3.11'
-numpy==1.26.1; python_version == '3.12'
+numpy==2.1.2; python_version == '3.12'
+numpy==2.1.2; python_version == '3.13'
diff --git a/tests/unit/workflows/python_pip/test_packager.py b/tests/unit/workflows/python_pip/test_packager.py
@@ -106,6 +106,9 @@ def test_get_lambda_abi_python311(self):
     def test_get_lambda_abi_python312(self):
         assert "cp312" == get_lambda_abi("python3.12")
 
+    def test_get_lambda_abi_python313(self):
+        assert "cp313" == get_lambda_abi("python3.13")
+
 
 class TestPythonPipDependencyBuilder(object):
     def test_can_call_dependency_builder(self, osutils):
