Merge from aws/aws-sam-cli/develop

aws · Sep 26, 2024 · 9c33647 · 9c33647
2 parents 40df58e + 3aad0d5
commit 9c33647
Show file tree

Hide file tree

Showing 10 changed files with 590 additions and 549 deletions.
diff --git a/installer/pyinstaller/build-linux.sh b/installer/pyinstaller/build-linux.sh
@@ -16,7 +16,7 @@ if [ "$python_version" = "" ]; then
 fi
 
 if [ "$openssl_version" = "" ]; then
-    openssl_version="3.0.14";
+    openssl_version="3.0.15";
 fi
 
 if [ "$zlib_version" = "" ]; then

diff --git a/installer/pyinstaller/build-mac.sh b/installer/pyinstaller/build-mac.sh
@@ -30,7 +30,7 @@ if [ "$python_library_zip_filename" = "" ]; then
 fi
 
 if [ "$openssl_version" = "" ]; then
-    openssl_version="3.0.14";
+    openssl_version="3.0.15";
 fi
 
 if [ "$python_version" = "" ]; then

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -28,7 +28,7 @@ regex!=2021.10.8
 tzlocal==5.2
 
 #Adding cfn-lint dependency for SAM validate
-cfn-lint~=1.12.4
+cfn-lint~=1.14.2
 
 # Type checking boto3 objects
-boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.35.14
+boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.35.23
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -9,10 +9,10 @@ pytest-cov==5.0.0
 # here we fix its version and upgrade it manually in the future
 mypy==1.11.2
 types-pywin32==306.0.0.20240822
-types-PyYAML==6.0.12.20240808
+types-PyYAML==6.0.12.20240917
 types-chevron==0.14.2.20240310
 types-psutil==6.0.0.20240901
-types-setuptools==74.1.0.20240907
+types-setuptools==75.1.0.20240917
 types-Pygments==2.18.0.20240506 
 types-colorama==0.4.15.20240311
 types-dateparser==1.2.0.20240420
@@ -22,12 +22,12 @@ 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.0.20240907; python_version>="3.10"
+types-requests==2.32.0.20240914; python_version>="3.10"
 types-urllib3==1.26.25.14
 
 # Test requirements
 
-pytest==8.3.2
+pytest==8.3.3
 
 parameterized==0.9.0
 pytest-xdist==3.6.1

diff --git a/requirements/pre-dev.txt b/requirements/pre-dev.txt
@@ -1 +1 @@
-ruff==0.6.4
+ruff==0.6.6
diff --git a/requirements/pyinstaller-build.txt b/requirements/pyinstaller-build.txt
@@ -1,3 +1,3 @@
 # Executable binary builder requirements
-setuptools==70.3.0
+setuptools==75.1.0
 pyinstaller==6.10.0
diff --git a/requirements/reproducible-linux.txt b/requirements/reproducible-linux.txt
diff --git a/requirements/reproducible-mac.txt b/requirements/reproducible-mac.txt
diff --git a/requirements/reproducible-win.txt b/requirements/reproducible-win.txt
diff --git a/samcli/__init__.py b/samcli/__init__.py
@@ -2,4 +2,4 @@
 SAM CLI version
 """
 
-__version__ = "1.124.0"
+__version__ = "1.125.0"