Merge branch 'develop'

Author: aws-sam-cli-bot

.github/workflows/build.yml

@@ -30,7 +30,8 @@ jobs:
       - java-maven-integration
       - java-gradle-integration
       - custom-make-integration
-      - python-integration
+      - python-pip-integration
+      - python-uv-integration
       - ruby-integration
       - dotnet-integration
       - rust-cargo-lambda-integration
@@ -44,7 +45,8 @@ jobs:
           needs.java-maven-integration.result != 'success' ||
           needs.java-gradle-integration.result != 'success' ||
           needs.custom-make-integration.result != 'success' ||
-          needs.python-integration.result != 'success' ||
+          needs.python-pip-integration.result != 'success' ||
+          needs.python-uv-integration.result != 'success' ||
           needs.ruby-integration.result != 'success' ||
           needs.dotnet-integration.result != 'success' ||
           needs.rust-cargo-lambda-integration.result != 'success'
@@ -74,6 +76,7 @@ jobs:
       - uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python }}
+      - uses: astral-sh/setup-uv@v7
       - name: Unit Testing
         run: make pr
       - name: Functional Testing
@@ -248,8 +251,8 @@ jobs:
       - run: make init
       - run: pytest -vv tests/integration/workflows/custom_make
 
-  python-integration:
-    name: ${{ matrix.os }} / ${{ matrix.python }} / python
+  python-pip-integration:
+    name: ${{ matrix.os }} / ${{ matrix.python }} / python-pip
     if: github.repository_owner == 'aws'
     runs-on: ${{ matrix.os }}
     strategy:
@@ -277,6 +280,40 @@ jobs:
       - run: make init
       - run: pytest -vv tests/integration/workflows/python_pip
 
+  python-uv-integration:
+    name: ${{ matrix.os }} / ${{ matrix.python }} / python-uv
+    if: github.repository_owner == 'aws'
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+          - windows-latest
+        python:
+          - "3.9"
+          - "3.10"
+          - "3.11"
+          - "3.12"
+          - "3.13"
+          - "3.14"
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
+        with:
+          python-version: ${{ matrix.python }}
+      - run: |
+          python -m pip install --upgrade pip
+          pip install --upgrade setuptools
+        if: ${{ matrix.os }} == 'ubuntu-latest' && ${{ matrix.python }} == '3.12'
+      # Install UV for python_uv workflow tests
+      - name: Install UV
+        uses: astral-sh/setup-uv@v7
+        with:
+          enable-cache: true
+      - run: make init
+      - run: pytest -vv tests/integration/workflows/python_uv
+
   ruby-integration:
     name: ${{ matrix.os }} / ${{ matrix.python }} / ruby
     if: github.repository_owner == 'aws'

README.md

@@ -14,6 +14,7 @@ Lambda Builders currently contains the following workflows
 * Java with Maven
 * Dotnet with amazon.lambda.tools
 * Python with Pip
+* Python with Uv (beta)
 * Javascript with Npm
 * Typescript with esbuild
 * Ruby with Bundler

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.61.0"
+__version__ = "1.62.0"
 RPC_PROTOCOL_VERSION = "0.3"

aws_lambda_builders/workflows/__init__.py

@@ -10,5 +10,6 @@
 import aws_lambda_builders.workflows.nodejs_npm
 import aws_lambda_builders.workflows.nodejs_npm_esbuild
 import aws_lambda_builders.workflows.python_pip
+import aws_lambda_builders.workflows.python_uv
 import aws_lambda_builders.workflows.ruby_bundler
 import aws_lambda_builders.workflows.rust_cargo

aws_lambda_builders/workflows/java_maven/maven.py

@@ -28,21 +28,21 @@ def __init__(self, maven_binary, os_utils=None):
 
     def build(self, scratch_dir):
         args = ["clean", "install"]
-        ret_code, stdout, _ = self._run(args, scratch_dir)
+        ret_code, stdout, stderr = self._run(args, scratch_dir)
 
         LOG.debug("Maven logs: %s", decode(stdout))
 
         if ret_code != 0:
-            raise MavenExecutionError(message=decode(stdout))
+            raise MavenExecutionError(message=decode(stderr))
 
     def copy_dependency(self, scratch_dir):
         include_scope = "runtime"
         LOG.debug("Running copy_dependency with scope: %s", include_scope)
         args = ["dependency:copy-dependencies", f"-DincludeScope={include_scope}", "-Dmdep.prependGroupId=true"]
-        ret_code, stdout, _ = self._run(args, scratch_dir)
+        ret_code, stdout, stderr = self._run(args, scratch_dir)
 
         if ret_code != 0:
-            raise MavenExecutionError(message=decode(stdout))
+            raise MavenExecutionError(message=decode(stderr))
 
     def _run(self, args, cwd=None):
         p = self.os_utils.popen(