Merge from aws/aws-sam-cli/develop

.github/workflows/build.yml

@@ -144,6 +144,7 @@ jobs:
             3.10
             3.11
             3.12
+            3.13
             ${{ matrix.python }}
       - uses: actions/setup-go@v5
         with:
@@ -249,6 +250,7 @@ jobs:
             3.10
             3.11
             3.12
+            3.13
       - name: Stop Docker Linux
         if: ${{ matrix.os == 'ubuntu-latest' }}
         run: |

appveyor-linux-binary.yml

@@ -77,7 +77,7 @@ install:
   - sh: "./aws_cli/bin/python -m pip install awscli"
   - sh: "PATH=$(echo $PWD'/aws_cli/bin'):$PATH"
 
-  - sh: "PATH=$PATH:$HOME/venv3.7/bin:$HOME/venv3.8/bin:$HOME/venv3.9/bin:$HOME/venv3.10/bin:$HOME/venv3.11/bin:$HOME/venv3.12/bin"
+  - sh: "PATH=$PATH:$HOME/venv3.7/bin:$HOME/venv3.8/bin:$HOME/venv3.9/bin:$HOME/venv3.10/bin:$HOME/venv3.11/bin:$HOME/venv3.12/bin:$HOME/venv3.13/bin"
 
   # Install pytest
   - sh: "python3.9 -m venv $HOME/pytest"

appveyor-ubuntu.yml

@@ -75,7 +75,7 @@ install:
   - sh: "./aws_cli/bin/python -m pip install awscli"
   - sh: "PATH=$(echo $PWD'/aws_cli/bin'):$PATH"
 
-  - sh: "PATH=$PATH:$HOME/venv3.7/bin:$HOME/venv3.8/bin:$HOME/venv3.9/bin:$HOME/venv3.10/bin:$HOME/venv3.11/bin:$HOME/venv3.12/bin"
+  - sh: "PATH=$PATH:$HOME/venv3.7/bin:$HOME/venv3.8/bin:$HOME/venv3.9/bin:$HOME/venv3.10/bin:$HOME/venv3.11/bin:$HOME/venv3.12/bin:$HOME/venv3.13/bin"
 
   # update ca-certificates which causes failures with newest golang library
   - sh: "sudo apt-get install --reinstall ca-certificates"

appveyor-windows-al2023.yml

@@ -53,7 +53,21 @@ install:
 
   # Make sure the temp directory exists for Python to use.
   - ps: "mkdir -Force C:\\tmp"
-  - 'set PATH=%PYTHON_HOME%;C:\Ruby33-x64\bin;C:\Ruby32-x64\bin;%PATH%;C:\Python39-x64;C:\Python310-x64;C:\Python311-x64;C:\Python312-x64'
+  - "python --version"
+  # Temporarily install python3.13 from the embedded zip file. Once AppVeyor installs it in the image, the below code can be removed.
+  - ps: 'Invoke-WebRequest -Uri https://www.python.org/ftp/python/3.13.0/python-3.13.0-embed-amd64.zip -OutFile python313.zip'
+  - ps: "Expand-Archive -Path python313.zip -DestinationPath C:\\Python313-x64"
+  - 'set PATH=%PYTHON_HOME%;C:\Ruby33-x64\bin;C:\Ruby32-x64\bin;%PATH%;C:\Python39-x64;C:\Python310-x64;C:\Python311-x64;C:\Python312-x64;C:\Python313-x64;C:\Python313-x64\Scripts;'
+  - ps: | 
+      $pth_file = "C:\Python313-x64\python313._pth"
+      (Get-Content -Path $pth_file) -replace '#import site', 'import site' | Set-Content -Path $pth_file
+  - ps: |
+      if (!(Test-Path -Path "C:\Python313-x64\Scripts\pip.exe")) {
+          Invoke-WebRequest -Uri https://bootstrap.pypa.io/get-pip.py -OutFile get-pip.py
+          & "C:\Python313-x64\python.exe" get-pip.py
+      }
+  - "python --version"
+  - ps: pip --version
   - "echo %PYTHON_HOME%"
   - "echo %PATH%"
   - "python --version"

appveyor-windows-binary.yml

@@ -67,7 +67,7 @@ install:
 
   # Make sure the temp directory exists for Python to use.
   - ps: "mkdir -Force C:\\tmp"
-  - 'set PATH=%PYTHON_HOME%;C:\Ruby32-x64\bin;%PATH%;C:\Python39-x64;C:\Python310-x64;C:\Python38-x64;C:\Python312-x64'
+  - 'set PATH=%PYTHON_HOME%;C:\Ruby32-x64\bin;%PATH%;C:\Python39-x64;C:\Python310-x64;C:\Python38-x64;C:\Python312-x64;C:\Python313-x64'
   - "echo %PYTHON_HOME%"
   - "echo %PATH%"
   - "python --version"

appveyor-windows.yml

@@ -66,7 +66,7 @@ install:
 
   # Make sure the temp directory exists for Python to use.
   - ps: "mkdir -Force C:\\tmp"
-  - 'set PATH=%PYTHON_HOME%;C:\Ruby32-x64\bin;%PATH%;C:\Python39-x64;C:\Python310-x64;C:\Python311-x64;C:\Python312-x64'
+  - 'set PATH=%PYTHON_HOME%;C:\Ruby32-x64\bin;%PATH%;C:\Python39-x64;C:\Python310-x64;C:\Python311-x64;C:\Python312-x64;C:\Python313-x64'
   - "echo %PYTHON_HOME%"
   - "echo %PATH%"
   - "python --version"

requirements/base.txt

@@ -6,18 +6,18 @@ jmespath~=1.0.1
 ruamel_yaml~=0.18.6
 PyYAML~=6.0
 cookiecutter~=2.6.0
-aws-sam-translator==1.91.0
+aws-sam-translator==1.92.0
 #docker minor version updates can include breaking changes. Auto update micro version only.
 docker~=7.1.0
 dateparser~=1.2
 requests~=2.32.3
-aws_lambda_builders==1.50.0
+aws_lambda_builders==1.51.0
 tomlkit==0.13.2
 # 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
 watchdog==4.0.2
 
-rich~=13.9.2
+rich~=13.9.4
 pyopenssl~=24.2.1
 # Pin to <4.18 to until SAM-T no longer uses RefResolver
 jsonschema<4.24
@@ -31,7 +31,7 @@ regex!=2021.10.8
 tzlocal==5.2
 
 #Adding cfn-lint dependency for SAM validate
-cfn-lint~=1.17.2
+cfn-lint~=1.18.4
 
 # Type checking boto3 objects
-boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.35.49
+boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.35.56

requirements/dev.txt

@@ -9,11 +9,11 @@ pytest-cov==5.0.0
 # 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.11.2
-types-pywin32==308.0.0.20241025
+types-pywin32==308.0.0.20241029
 types-PyYAML==6.0.12.20240917
 types-chevron==0.14.2.20240310
-types-psutil==6.1.0.20241022
-types-setuptools==75.2.0.20241025
+types-psutil==6.1.0.20241102
+types-setuptools==75.3.0.20241107
 types-Pygments==2.18.0.20240506 
 types-colorama==0.4.15.20240311
 types-dateparser==1.2.0.20240420

requirements/pre-dev.txt

@@ -1 +1 @@
-ruff==0.6.9
+ruff==0.7.2

requirements/pyinstaller-build.txt

@@ -1,3 +1,3 @@
 # Executable binary builder requirements
-setuptools==75.1.0
+setuptools==75.3.0
 pyinstaller==6.11.0