Merge branch 'develop' into tmp-disallow-relative-imports

Author: roger-zhangg

.github/workflows/build.yml

@@ -68,6 +68,7 @@ jobs:
     - uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python }}
+    - uses: astral-sh/setup-uv@v7
     - run: test -f "./.github/ISSUE_TEMPLATE/Bug_report.md"  # prevent Bug_report.md from being renamed or deleted
     - run: make pr
 

.github/workflows/integration-tests.yml

@@ -105,7 +105,7 @@ jobs:
           fi
 
       - name: Configure AWS credentials via OIDC
-        uses: aws-actions/configure-aws-credentials@v5
+        uses: aws-actions/configure-aws-credentials@v6
         with:
           role-to-assume: ${{ secrets.OIDC_ROLE_ARN }}
           aws-region: us-east-1
@@ -121,6 +121,9 @@ jobs:
             3.13
             3.14
 
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+
       - name: Set up Node.js
         if: contains(fromJSON('["build-integ", "build-integ-java-python-provided", "build-integ-dotnet-node-ruby", "build-integ-arm64"]'), matrix.test_suite) && matrix.container_runtime == 'no-container'
         uses: actions/setup-node@v6

.github/workflows/notify-slack.yml

@@ -12,8 +12,11 @@ jobs:
     permissions:
       contents: read
     steps:
+      - name: Wait for label to be applied
+        run: sleep 10s
+        shell: bash
       - name: Send External PR Notification
-        if: github.event_name == 'pull_request' && github.event.label.name == 'pr/external'
+        if: github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'pr/external')
         uses: rtCamp/action-slack-notify@e31e87e03dd19038e411e38ae27cbad084a90661 # v2
         env:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}

requirements/base.txt

@@ -3,7 +3,7 @@ click==8.1.8
 Flask<3.2
 boto3[crt]==1.42.26
 jmespath~=1.0.1
-ruamel_yaml~=0.18.16
+ruamel_yaml~=0.19.1
 PyYAML~=6.0
 cookiecutter~=2.6.0
 aws-sam-translator==1.107.0

requirements/reproducible-linux.txt

@@ -134,6 +134,11 @@ def cli(ctx):
     import atexit
 
     from samcli.lib.telemetry.metric import emit_all_metrics, send_installed_metric
+    from samcli.lib.utils.subprocess_utils import isolate_library_paths_for_subprocess
+
+    # When running from PyInstaller bundle, isolate library paths so external processes
+    # (npm, node, pip, etc.) use system libraries instead of bundled ones
+    isolate_library_paths_for_subprocess()
 
     # if development version of SAM CLI is used, attach module proxy
     # to catch missing configuration for dynamic/hidden imports

requirements/reproducible-mac.txt

@@ -55,6 +55,9 @@ class ExperimentalFlag:
         )
     }
     RustCargoLambda = ExperimentalEntry("experimentalCargoLambda", EXPERIMENTAL_ENV_VAR_PREFIX + "RUST_CARGO_LAMBDA")
+    UvPackageManager = ExperimentalEntry(
+        "experimentalUvPackageManager", EXPERIMENTAL_ENV_VAR_PREFIX + "UV_PACKAGE_MANAGER"
+    )
 
 
 def is_experimental_enabled(config_entry: ExperimentalEntry) -> bool:

requirements/reproducible-win.txt

@@ -281,7 +281,7 @@ def run(self) -> None:
             )
 
             self._check_exclude_warning()
-            self._check_rust_cargo_experimental_flag()
+            self._check_build_method_experimental_flag()
 
             for f in self.get_resources_to_build().functions:
                 EventTracker.track_event(EventName.BUILD_FUNCTION_RUNTIME.value, f.runtime)
@@ -696,24 +696,26 @@ def _check_exclude_warning(self) -> None:
         if self._resource_identifier in excludes:
             LOG.warning(self._EXCLUDE_WARNING_MESSAGE)
 
-    def _check_rust_cargo_experimental_flag(self) -> None:
+    def _check_build_method_experimental_flag(self) -> None:
         """
         Prints warning message and confirms if user wants to use beta feature
         """
-        WARNING_MESSAGE = (
-            'Build method "rust-cargolambda" is a beta feature.\n'
-            "Please confirm if you would like to proceed\n"
-            'You can also enable this beta feature with "sam build --beta-features".'
-        )
+        EXPERIMENTAL_BUILD_METHODS = {
+            "rust-cargolambda": ExperimentalFlag.RustCargoLambda,
+            "python-uv": ExperimentalFlag.UvPackageManager,
+        }
+
         resources_to_build = self.get_resources_to_build()
-        is_building_rust = False
         for function in resources_to_build.functions:
-            if function.metadata and function.metadata.get("BuildMethod", "") == "rust-cargolambda":
-                is_building_rust = True
-                break
+            if function.metadata and function.metadata.get("BuildMethod", "") in EXPERIMENTAL_BUILD_METHODS:
+                build_method = function.metadata.get("BuildMethod", "")
+                WARNING_MESSAGE = (
+                    f'Build method "{build_method}" is a beta feature.\n'
+                    "Please confirm if you would like to proceed\n"
+                    'You can also enable this beta feature with "sam build --beta-features".'
+                )
 
-        if is_building_rust:
-            prompt_experimental(ExperimentalFlag.RustCargoLambda, WARNING_MESSAGE)
+                prompt_experimental(EXPERIMENTAL_BUILD_METHODS[build_method], WARNING_MESSAGE)
 
     @property
     def build_in_source(self) -> Optional[bool]: