Merge from aws/aws-sam-cli/develop

Author: aws-sam-cli-bot

.github/workflows/automated-updates-to-sam-cli.yml

@@ -14,13 +14,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout App Templates
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: aws/aws-sam-cli-app-templates
           path: aws-sam-cli-app-templates
 
       - name: Checkout SAM CLI
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: aws/aws-sam-cli
           path: aws-sam-cli
@@ -59,15 +59,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout SAM
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: aws/serverless-application-model
           path: serverless-application-model
           ref: main
           fetch-depth: 0
 
       - name: Checkout SAM CLI
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: aws/aws-sam-cli
           path: aws-sam-cli
@@ -110,15 +110,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Lambda Builders
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: aws/aws-lambda-builders
           path: aws-lambda-builders
           ref: main
           fetch-depth: 0
 
       - name: Checkout SAM CLI
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: aws/aws-sam-cli
           path: aws-sam-cli

.github/workflows/build.yml

@@ -58,8 +58,8 @@ jobs:
           - "3.9"
           - "3.11"
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
+    - uses: actions/checkout@v5
+    - uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python }}
     - run: test -f "./.github/ISSUE_TEMPLATE/Bug_report.md"  # prevent Bug_report.md from being renamed or deleted
@@ -74,8 +74,8 @@ jobs:
       contents: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         name: Install Python 3.11
         with:
           python-version: 3.11
@@ -132,8 +132,8 @@ jobs:
           #- "validate"
           - "tests/integration/docs"
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         with:
           # set last version as the one in matrix to make it default
           python-version: |
@@ -143,16 +143,16 @@ jobs:
             3.12
             3.13
             ${{ matrix.python }}
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v6
         with:
           go-version: '1.19'
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: "3.3"
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
           node-version: 22
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
         with:
           distribution: 'corretto'
           java-version: |
@@ -213,8 +213,8 @@ jobs:
           - "3.9"
           - "3.11"
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python }}
       - name: Init samdev
@@ -235,8 +235,8 @@ jobs:
           - ubuntu-latest
           - windows-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         with:
           # These are the versions of Python that correspond to the supported Lambda runtimes
           python-version: |

.github/workflows/codeql.yml

@@ -42,7 +42,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/pr-labeler.yml

@@ -9,7 +9,7 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@v5
+    - uses: actions/labeler@v6
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
   apply-internal-external-label:
@@ -19,7 +19,7 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@v7
+      - uses: actions/github-script@v8
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |

.github/workflows/update-reproducibles.yml

@@ -30,10 +30,10 @@ jobs:
       max-parallel: 1
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           ref: ${{ github.head_ref }}
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python }}
       - run: make ${{ matrix.target }}

.github/workflows/validate_pyinstaller.yml

@@ -16,14 +16,14 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Make installer script executable
         run: chmod +x ./installer/pyinstaller/build-linux.sh
       - name: Build PyInstaller in manylinux container
         run: |
           docker run --rm -v .:/samcli -w /samcli -e CI_OVERRIDE='1' \
           quay.io/pypa/manylinux2014_x86_64:latest /samcli/installer/pyinstaller/build-linux.sh aws-sam-cli-linux-x86_64.zip
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: 3.11
       - name: Basic tests for PyInstaller
@@ -45,8 +45,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.11"
       - name: Build PyInstaller

appveyor-windows-al2023.yml

@@ -65,7 +65,7 @@ install:
   - "ruby --version"
   - ps: "Restart-Service docker"
   # Switch to Docker Linux containers
-  - ps: '& $Env:ProgramFiles\Docker\Docker\DockerCli.exe -SwitchLinuxEngine'4
+  - ps: '& $Env:ProgramFiles\Docker\Docker\DockerCli.exe -SwitchLinuxEngine'
   - "docker info"
   - "docker version"
 

pyproject.toml

@@ -11,7 +11,7 @@ select = [
     "PL", # pylint
     "I",  # isort
 ]
-ignore = ["PLR0913"]
+ignore = ["PLR0913", "PLC0415", "PLW1641"]
 
 [tool.ruff.lint.pylint]
 max-branches = 25

requirements/base.txt

@@ -3,15 +3,15 @@ click==8.1.8
 Flask<3.2
 boto3>=1.29.2,<2
 jmespath~=1.0.1
-ruamel_yaml~=0.18.14
+ruamel_yaml~=0.18.15
 PyYAML~=6.0
 cookiecutter~=2.6.0
-aws-sam-translator==1.99.0
+aws-sam-translator==1.100.0
 #docker minor version updates can include breaking changes. Auto update micro version only.
 docker~=7.1.0
 dateparser~=1.2
-requests~=2.32.4
-aws_lambda_builders==1.57.0
+requests~=2.32.5
+aws_lambda_builders==1.58.0
 tomlkit==0.13.3
 # NOTE: For supporting watchdog in Python3.8, version is pinned to 4.0.2 as 
 # version 5.0.2 introduced some breaking changes for versions > Python3.8
@@ -31,7 +31,7 @@ regex!=2021.10.8
 tzlocal==5.3.1
 
 #Adding cfn-lint dependency for SAM validate
-cfn-lint~=1.38.1
+cfn-lint~=1.39.1
 
 # Type checking boto3 objects
-boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.39.7
+boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.40.26

requirements/dev.txt

@@ -1,31 +1,31 @@
 -r pre-dev.txt
 
-coverage==7.9.2; python_version>="3.9"
+coverage==7.10.2; python_version>="3.9"
 coverage==7.6.1; python_version<"3.9"
-pytest-cov==6.2.1; python_version>="3.9"
+pytest-cov==6.3.0; python_version>="3.9"
 pytest-cov==5.0.0; python_version<"3.9"
 
 
 # type checking and related stubs
 # mypy adds new rules in new minor versions, which could cause our PR check to fail
 # here we fix its version and upgrade it manually in the future
 mypy==1.15.0
-types-pywin32==311.0.0.20250723; python_version>="3.9"
+types-pywin32==311.0.0.20250822; python_version>="3.9"
 types-pywin32==308.0.0.20241221; python_version<"3.9"
-types-PyYAML==6.0.12.20250516
+types-PyYAML==6.0.12.20250822
 types-chevron==0.14.2.20250103
-types-psutil==7.0.0.20250601
-types-setuptools==80.9.0.20250529
-types-Pygments==2.19.0.20250715 
-types-colorama==0.4.15.20240311
-types-dateparser==1.2.2.20250627
-types-docutils==0.21.0.20250722
-types-jsonschema==4.25.0.20250720
+types-psutil==7.0.0.20250822
+types-setuptools==80.9.0.20250822
+types-Pygments==2.19.0.20250809 
+types-colorama==0.4.15.20250801
+types-dateparser==1.2.2.20250809
+types-docutils==0.22.0.20250822
+types-jsonschema==4.25.1.20250822
 types-pyOpenSSL==24.1.0.20240722
 # lucashuy: pin `types-request` based on the Python version since newer versions of
 # the types require a newer version of requests, which is only installed in newer versions of Python
 types-requests==2.31.0.6; python_version<"3.10"
-types-requests==2.32.4.20250611; python_version>="3.10"
+types-requests==2.32.4.20250809; python_version>="3.10"
 types-urllib3==1.26.25.14
 
 # Test requirements
@@ -36,13 +36,13 @@ parameterized==0.9.0
 pytest-xdist==3.8.0
 pytest-forked==1.6.0
 pytest-timeout==2.4.0
-pytest-rerunfailures==15.1;  python_version>="3.9"
+pytest-rerunfailures==16.0.1;  python_version>="3.9"
 pytest-rerunfailures==14.0;  python_version<"3.9"
 # NOTE (hawflau): DO NOT upgrade pytest-metadata and pytest-json-report unless pytest-json-report addresses https://github.com/numirias/pytest-json-report/issues/89
 pytest-metadata==3.1.1
 # NOTE (lucashuy): `pytest-json-report` was updated to `pytest-json-report-wip` as the original repository does not seem to be maintained anymore, if `-wip` is updated, validate the changes
 pytest-json-report-wip==1.5.1
-filelock==3.18.0;  python_version>="3.9"
+filelock==3.19.1;  python_version>="3.9"
 filelock==3.16.1;  python_version<"3.9"
 
 # formatter