Merge branch 'develop' of github.com:aws/aws-sam-cli into nightly

Author: roger-zhangg

.github/dependabot.yml

@@ -32,9 +32,7 @@ updates:
         - "botocore-stubs"
         - "mypy-boto3-*"
         - "types-awscrt"
-      types:
-        patterns:
-        - "types-*"
+        - "types-s3transfer"
       pytest:
         patterns:
         - "pytest-*"
@@ -43,6 +41,68 @@ updates:
         # as of writing this
         - "pytest-metadata"
         - "pytest-json-report"
+      cookiecutter:
+        patterns:
+        - "cookiecutter"
+        - "arrow"
+        - "binaryornot"
+        - "chardet"
+        - "python-slugify"
+        - "text-unidecode"
+      flask:
+        patterns:
+        - "flask"
+        - "blinker"
+        - "werkzeug"
+        - "itsdangerous"
+      cfn-lint:
+        patterns:
+        - "cfn-lint"
+        - "networkx"
+        - "sympy"
+        - "mpmath"
+        - "jsonpatch"
+        - "jsonpointer"
+      cryptography:
+        patterns:
+        - "cryptography"
+        - "pyopenssl"
+        - "cffi"
+        - "pycparser"
+      requests:
+        patterns:
+        - "requests"
+        - "certifi"
+        - "charset-normalizer"
+        - "idna"
+        - "urllib3"
+      rich:
+        patterns:
+        - "rich"
+        - "markdown-it-py"
+        - "mdurl"
+        - "pygments"
+      jsonschema:
+        patterns:
+        - "jsonschema"
+        - "jsonschema-specifications"
+        - "referencing"
+        - "attrs"
+        - "rpds-py"
+      pydantic:
+        patterns:
+        - "pydantic"
+        - "pydantic-core"
+        - "annotated-types"
+        - "typing-inspection"
+      jinja2:
+        patterns:
+        - "jinja2"
+        - "markupsafe"
+      pyyaml:
+        patterns:
+        - "pyyaml"
+        - "ruamel-yaml"
     ignore:
       # Ignored intentionally since we have a GHA that updates to more
       # completely

.github/workflows/integration-tests.yml

@@ -112,7 +112,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v6
         with:
-          ref: ${{ env.TEST_TYPE == 'nightly-release' && 'nightly-builds' || (github.event_name == 'schedule' && 'develop' || github.ref) }}
+          ref: ${{ (env.TEST_TYPE == 'nightly-release' && github.event.action == 'published') && 'nightly-builds' || (github.event_name == 'schedule' && 'develop' || github.ref) }}
 
       - name: Free up disk space
         shell: bash
@@ -189,6 +189,7 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.4.7'
+          windows-toolchain: none
 
       - name: Install Rust toolchain and cargo-lambda
         if: contains(fromJSON('["build-x86-1", "build-x86-2", "build-arm64", "cloud-based-tests", "tier1-finch", "tier1-windows-build-2", "tier1-windows-build-3", "tier1-windows-other"]'), matrix.test_suite)
@@ -225,13 +226,6 @@ jobs:
           make setup-pytest
           make init-nightly
           echo "SAM_CLI_DEV=" >> $GITHUB_ENV
-          # Detect venv python/pytest path (bin on Linux/macOS, Scripts on Windows)
-          if [ -f "$HOME/pytest/bin/python3" ]; then
-            echo "SCRIPT_PY=$HOME/pytest/bin/python3" >> $GITHUB_ENV
-          else
-            echo "SCRIPT_PY=$HOME/pytest/Scripts/python.exe" >> $GITHUB_ENV
-            echo "$HOME/pytest/Scripts" >> $GITHUB_PATH
-          fi
 
       - name: Initialize latest release test
         if: env.TEST_TYPE == 'latest-release'
@@ -242,12 +236,6 @@ jobs:
           make setup-pytest
           make init-latest-release
           echo "SAM_CLI_DEV=" >> $GITHUB_ENV
-          if [ -f "$HOME/pytest/bin/python3" ]; then
-            echo "SCRIPT_PY=$HOME/pytest/bin/python3" >> $GITHUB_ENV
-          else
-            echo "SCRIPT_PY=$HOME/pytest/Scripts/python.exe" >> $GITHUB_ENV
-            echo "$HOME/pytest/Scripts" >> $GITHUB_PATH
-          fi
 
       - name: Configure AWS credentials via OIDC
         uses: aws-actions/configure-aws-credentials@v6
@@ -450,29 +438,29 @@ jobs:
           esac
 
       - name: Upload test results
-        if: always()
+        if: always() && env.SCRIPT_PY != ''
         uses: actions/upload-artifact@v7
         with:
           name: test-results-${{ matrix.test_suite }}
           path: TEST_REPORT-*.json
 
       - name: Re-authenticate with OIDC for cleanup
-        if: always()
+        if: always() && env.SCRIPT_PY != ''
         uses: aws-actions/configure-aws-credentials@v6
         with:
           role-to-assume: ${{ secrets.OIDC_ROLE_ARN }}
           aws-region: us-east-1
 
       - name: Assume test reporting role
-        if: always()
+        if: always() && env.SCRIPT_PY != ''
         uses: aws-actions/configure-aws-credentials@v6
         with:
           role-to-assume: ${{ secrets.TESTREPORTING_ARN }}
           aws-region: us-east-1
           role-chaining: true
 
       - name: Reset test account and upload reports
-        if: always()
+        if: always() && env.SCRIPT_PY != ''
         shell: bash
         env:
           TESTREPORTING_S3: ${{ secrets.TESTREPORTING_S3 }}

Makefile

@@ -6,24 +6,17 @@ SAM_CLI_TELEMETRY ?= 0
 
 # Initialize environment specifically for Github action tests using uv
 init:
-	@if [ "$$GITHUB_ACTIONS" = "true" ]; then \
+	if [ "$$GITHUB_ACTIONS" = "true" ]; then \
 		command -v uv >/dev/null 2>&1 || pip install uv==0.9.1; \
+		echo "=== UV_PYTHON resolved to: $$(uv python find $$UV_PYTHON) ==="; \
 		SAM_CLI_DEV=1 uv pip install --system --break-system-packages --python "$$(uv python find $$UV_PYTHON)" -e '.[dev]'; \
 	else \
 		SAM_CLI_DEV=1 pip install -e '.[dev]'; \
 	fi
 
-# Set up a pytest venv with test dependencies
 # Set up a pytest venv with test dependencies (cross-platform)
 setup-pytest:
-	python3.11 -m venv $(HOME)/pytest || python3 -m venv $(HOME)/pytest || python -m venv $(HOME)/pytest
-	uv pip install --python $(HOME)/pytest/bin/python3 --only-deps --extra dev '.' 2>/dev/null || \
-	  uv pip install --python $(HOME)/pytest/Scripts/python.exe --only-deps --extra dev '.'
-	@if [ -f "$(HOME)/pytest/bin/pytest" ]; then \
-	  sudo ln -sf $(HOME)/pytest/bin/pytest /usr/local/bin/pytest 2>/dev/null || true; \
-	fi
-	$(HOME)/pytest/bin/pytest --version 2>/dev/null || $(HOME)/pytest/Scripts/pytest --version
-
+	bash tests/setup-pytest.sh
 # Install SAM CLI nightly binary
 init-nightly:
 	bash tests/install-sam-cli-binary.sh sam-cli-nightly

pyproject.toml

@@ -7,7 +7,7 @@ dynamic = ["version", "scripts"]
 description = "AWS SAM CLI is a CLI tool for local development and testing of Serverless applications"
 readme = "README.md"
 license = "Apache-2.0"
-requires-python = ">=3.10, <=3.14"
+requires-python = ">=3.10"
 authors = [
     { name = "Amazon Web Services", email = "aws-sam-developers@amazon.com" },
 ]
@@ -35,11 +35,11 @@ dependencies = [
     "chevron~=0.12",
     "click==8.1.8",
     "Flask<3.2",
-    "boto3[crt]==1.42.59",
+    "boto3[crt]==1.42.64",
     "jmespath~=1.1.0",
     "ruamel_yaml~=0.19.1",
     "PyYAML~=6.0",
-    "cookiecutter~=2.6.0",
+    "cookiecutter>=2.6,<2.8",
     "aws-sam-translator==1.107.0",
     # docker minor version updates can include breaking changes. Auto update micro version only.
     "docker~=7.1.0",
@@ -56,14 +56,14 @@ dependencies = [
     # regex is not a direct dependency of SAM CLI, exclude version 2021.10.8 due to not working on M1 Mac
     "regex!=2021.10.8",
     "tzlocal==5.3.1",
-    "cfn-lint~=1.45.0",
+    "cfn-lint>=1.45,<1.47",
     "boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]>=1.41.0",
     "python-dotenv~=1.0.0",
 ]
 
 [project.optional-dependencies]
 pre-dev = [
-    "ruff==0.15.4",
+    "ruff==0.15.5",
 ]
 dev = [
     "aws-sam-cli[pre-dev]",
@@ -91,8 +91,8 @@ dev = [
     "pytest-rerunfailures==16.1",
     "pytest-metadata==3.1.1",
     "pytest-json-report-wip==1.5.1",
-    "filelock==3.25.0",
-    "black==26.1.0",
+    "filelock==3.25.1",
+    "black==26.3.0",
     "psutil==7.2.2",
     "chardet<6",
 ]

requirements/pyinstaller-build.txt

@@ -1,3 +1,3 @@
 # Executable binary builder requirements
-setuptools==82.0.0
+setuptools==82.0.1
 pyinstaller==6.19.0

requirements/reproducible-linux.txt

@@ -74,19 +74,19 @@ blinker==1.9.0 \
     --hash=sha256:b4ce2265a7abece45e7cc896e98dbebe6cead56bcf805a3d23136d145f5445bf \
     --hash=sha256:ba0efaa9080b619ff2f3459d1d500c57bddea4a6b424b60a91141db6fd2f08bc
     # via flask
-boto3[crt]==1.42.59 \
-    --hash=sha256:6c4a14a4eb37b58a9048901bdeefbe1c529638b73e8f55413319a25f010ca211 \
-    --hash=sha256:7a66e3e8e2087ea4403e135e9de592e6d63fc9a91080d8dac415bb74df873a72
+boto3[crt]==1.42.64 \
+    --hash=sha256:2ca6b472937a54ba74af0b4bede582ba98c070408db1061fc26d5c3aa8e6e7e6 \
+    --hash=sha256:58d47897a26adbc22f6390d133dab772fb606ba72695291a8c9e20cba1c7fd23
     # via
     #   aws-sam-cli (pyproject.toml)
     #   aws-sam-translator
-boto3-stubs[apigateway, cloudformation, ecr, iam, kinesis, lambda, s3, schemas, secretsmanager, signer, sqs, stepfunctions, sts, xray]==1.42.59 \
-    --hash=sha256:4a6fc520560ee6a2cb9e05bdfcd45d4e07d9fb91cf483dfbd3a5ab87efe6b860 \
-    --hash=sha256:bef0080a1bbb3f6bfe0cdc0c3d0771bdb91729f5a415ad09397df1ec2aca7256
+boto3-stubs[apigateway, cloudformation, ecr, iam, kinesis, lambda, s3, schemas, secretsmanager, signer, sqs, stepfunctions, sts, xray]==1.42.64 \
+    --hash=sha256:54e849fc3ae8ad73e049c304a425b3335ee81801bd00f80d9d1e3ae8d6ba5e17 \
+    --hash=sha256:f184e7108b6b6220dd55d082159de0b0630972552eeb951b87cfdac0f0235823
     # via aws-sam-cli (pyproject.toml)
-botocore[crt]==1.42.59 \
-    --hash=sha256:5314f19e1da8fc0ebc41bdb8bbe17c9a7397d87f4d887076ac8bdef972a34138 \
-    --hash=sha256:d2f2ff7ecc31e86ef46b5daee112cfbca052c13801285fb23af909f7bff5b657
+botocore[crt]==1.42.64 \
+    --hash=sha256:4ee2aece227b9171ace8b749af694a77ab984fceab1639f2626bd0d6fb1aa69d \
+    --hash=sha256:f77c5cb76ed30576ed0bc73b591265d03dddffff02a9208d3ee0c790f43d3cd2
     # via
     #   boto3
     #   s3transfer
@@ -184,9 +184,9 @@ cffi==2.0.0 \
     --hash=sha256:fc7de24befaeae77ba923797c7c87834c73648a05a4bde34b3b7e5588973a453 \
     --hash=sha256:fe562eb1a64e67dd297ccc4f5addea2501664954f2692b69a76449ec7913ecbf
     # via cryptography
-cfn-lint==1.45.0 \
-    --hash=sha256:0a05b34eff63f45d7b9b0465e01dca6c2035b730bd88910dca8c4bcf00913939 \
-    --hash=sha256:39aed0cdb3be4d09fad4ca4e410790313c1b6a4e4a9f0362dac1b1980dd48978
+cfn-lint==1.46.0 \
+    --hash=sha256:1dfca1993af3159411e4a4f79466617ccdca48eddaf424e216297167c500aa3b \
+    --hash=sha256:fa7cb76db683109133241baf1e1734b1d61b46d3900ba2a309db8f3d0e5d3994
     # via aws-sam-cli (pyproject.toml)
 chardet==5.2.0 \
     --hash=sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7 \
@@ -318,9 +318,9 @@ click==8.1.8 \
     #   aws-sam-cli (pyproject.toml)
     #   cookiecutter
     #   flask
-cookiecutter==2.6.0 \
-    --hash=sha256:a54a8e37995e4ed963b3e82831072d1ad4b005af736bb17b99c2cbd9d41b6e2d \
-    --hash=sha256:db21f8169ea4f4fdc2408d48ca44859349de2647fbe494a9d6c3edfc0542c21c
+cookiecutter==2.7.1 \
+    --hash=sha256:ca7bb7bc8c6ff441fbf53921b5537668000e38d56e28d763a1b73975c66c6138 \
+    --hash=sha256:cee50defc1eaa7ad0071ee9b9893b746c1b3201b66bf4d3686d0f127c8ed6cf9
     # via aws-sam-cli (pyproject.toml)
 cryptography==46.0.5 \
     --hash=sha256:02f547fce831f5096c9a567fd41bc12ca8f11df260959ecc7c3202555cc47a72 \
@@ -542,9 +542,9 @@ mypy-boto3-ecr==1.42.57 \
     --hash=sha256:09c0b4df95a73c217d62383da8a869e270ecd380585f6fd690a77714074817bf \
     --hash=sha256:1d6a3b2887090e5f08a28b35b4391a34d17575f518f52cdb879e2275323a4137
     # via boto3-stubs
-mypy-boto3-iam==1.42.4 \
-    --hash=sha256:41b17d55f44d31ca5ef0389579505e65f6e79fae0423b98ff2581e83f6284bc5 \
-    --hash=sha256:670ffeff6dee7eaa7f6f77ddfee1eeec2ab968b381efeddd3ccfe6f9971ac198
+mypy-boto3-iam==1.42.64 \
+    --hash=sha256:d01308ad4a197f8c465aed8002502793802f10fa0a01323b5efda4e2fbd937a5 \
+    --hash=sha256:d138d8f41e719d9bbfc4aa3d2095030202f0c0642b37d038d21a153814198582
     # via boto3-stubs
 mypy-boto3-kinesis==1.42.41 \
     --hash=sha256:6f2079ef5908ee5e467f6e85c30001f241e3e19edc0fa3a487e3f51f180fab96 \
@@ -1095,9 +1095,9 @@ s3transfer==0.16.0 \
     --hash=sha256:18e25d66fed509e3868dc1572b3f427ff947dd2c56f844a5bf09481ad3f3b2fe \
     --hash=sha256:8e990f13268025792229cd52fa10cb7163744bf56e719e0b9cb925ab79abf920
     # via boto3
-setuptools==82.0.0 \
-    --hash=sha256:22e0a2d69474c6ae4feb01951cb69d515ed23728cf96d05513d36e42b62b37cb \
-    --hash=sha256:70b18734b607bd1da571d097d236cfcfacaf01de45717d59e6e04b96877532e0
+setuptools==82.0.1 \
+    --hash=sha256:7d872682c5d01cfde07da7bccc7b65469d3dca203318515ada1de5eda35efbf9 \
+    --hash=sha256:a59e362652f08dcd477c78bb6e7bd9d80a7995bc73ce773050228a348ce2e5bb
     # via aws-lambda-builders
 six==1.17.0 \
     --hash=sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274 \
@@ -1115,9 +1115,9 @@ tomlkit==0.14.0 \
     --hash=sha256:592064ed85b40fa213469f81ac584f67a4f2992509a7c3ea2d632208623a3680 \
     --hash=sha256:cf00efca415dbd57575befb1f6634c4f42d2d87dbba376128adb42c121b87064
     # via aws-sam-cli (pyproject.toml)
-types-awscrt==0.31.2 \
-    --hash=sha256:3d6a29c1cca894b191be408f4d985a8e3a14d919785652dd3fa4ee558143e4bf \
-    --hash=sha256:dc79705acd24094656b8105b8d799d7e273c8eac37c69137df580cd84beb54f6
+types-awscrt==0.31.3 \
+    --hash=sha256:09d3eaf00231e0f47e101bd9867e430873bc57040050e2a3bd8305cb4fc30865 \
+    --hash=sha256:e5ce65a00a2ab4f35eacc1e3d700d792338d56e4823ee7b4dbe017f94cfc4458
     # via botocore-stubs
 types-s3transfer==0.16.0 \
     --hash=sha256:1c0cd111ecf6e21437cb410f5cddb631bfb2263b77ad973e79b9c6d0cb24e0ef \