Merge branch 'develop' into expanded-parameter-overrides

Author: roger-zhangg

.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,7 +58,7 @@ jobs:
           - "3.9"
           - "3.11"
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python }}
@@ -74,7 +74,7 @@ jobs:
       contents: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-python@v6
         name: Install Python 3.11
         with:
@@ -132,7 +132,7 @@ jobs:
           #- "validate"
           - "tests/integration/docs"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-python@v6
         with:
           # set last version as the one in matrix to make it default
@@ -213,7 +213,7 @@ jobs:
           - "3.9"
           - "3.11"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python }}
@@ -235,7 +235,7 @@ jobs:
           - ubuntu-latest
           - windows-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-python@v6
         with:
           # These are the versions of Python that correspond to the supported Lambda runtimes

.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

@@ -27,7 +27,8 @@ jobs:
               'aws-sam-cli-bot',
               'seshubaws', 'valerena',
               'Vandita2020', 'roger-zhangg',
-              'mbfreder', 'vicheey', 'rachdry', 'dependabot[bot]'
+              'vicheey', 'bnusunny', 'tobixlea', 
+              'reedham-aws', 'licjun', 'dependabot[bot]'
             ]
             if (maintainers.includes(context.payload.sender.login)) {
               github.rest.issues.addLabels({

.github/workflows/update-reproducibles.yml

@@ -30,7 +30,7 @@ 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@v6

.github/workflows/validate_pyinstaller.yml

@@ -16,7 +16,7 @@ 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
@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-python@v6
         with:
           python-version: "3.11"

Makefile

@@ -56,7 +56,7 @@ schema:
 	python -m schema.make_schema
 
 # Verifications to run before sending a pull request
-pr: init dev schema black-check
+pr: init schema black-check dev
 
 # lucashuy: Linux and MacOS are on the same Python version,
 # however we should follow up in a different change

README.md

@@ -71,7 +71,7 @@ We think you'll like the code base. Clone it and run `make pr` or `./Make -pr` o
 ## Contribute to SAM
 
 We love our contributors ❤️ We have over 100 contributors who have built various parts of the product.
-Read this [testimonial from @ndobryanskyy](https://www.lohika.com/aws-sam-my-exciting-first-open-source-experience/) to learn
+Read this [testimonial from @ndobryanskyy](https://www.awsadvent.com/2018/12/10/aws-sam-my-exciting-first-open-source-experience/) to learn
 more about what it was like contributing to SAM.
 
 Depending on your interest and skill, you can help build the different parts of the SAM project;

requirements/dev.txt

@@ -1,6 +1,6 @@
 -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.3.0; python_version>="3.9"
 pytest-cov==5.0.0; python_version<"3.9"
@@ -10,22 +10,22 @@ pytest-cov==5.0.0; python_version<"3.9"
 # 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.20250822; python_version>="3.9"
+types-pywin32==311.0.0.20250915; python_version>="3.9"
 types-pywin32==308.0.0.20241221; python_version<"3.9"
-types-PyYAML==6.0.12.20250822
+types-PyYAML==6.0.12.20250915
 types-chevron==0.14.2.20250103
 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-docutils==0.22.1.20250923
 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.20250809; python_version>="3.10"
+types-requests==2.32.4.20250913; python_version>="3.10"
 types-urllib3==1.26.25.14
 
 # Test requirements

requirements/pyinstaller-build.txt

@@ -1,3 +1,3 @@
 # Executable binary builder requirements
 setuptools==80.9.0
-pyinstaller==6.14.2
+pyinstaller==6.15.0