Merge from aws/aws-sam-cli/develop

aws-sam-cli-bot · web-flow · commit 50616eb8f776 · 2025-04-07T16:04:45.000-07:00
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -6,7 +6,7 @@ jmespath~=1.0.1
 ruamel_yaml~=0.18.6
 PyYAML~=6.0
 cookiecutter~=2.6.0
-aws-sam-translator==1.95.0
+aws-sam-translator==1.96.0
 #docker minor version updates can include breaking changes. Auto update micro version only.
 docker~=7.1.0
 dateparser~=1.2
@@ -31,7 +31,7 @@ regex!=2021.10.8
 tzlocal==5.2
 
 #Adding cfn-lint dependency for SAM validate
-cfn-lint~=1.32.0
+cfn-lint~=1.32.3
 
 # Type checking boto3 objects
 boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.35.71
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -1,6 +1,6 @@
 -r pre-dev.txt
 
-coverage==7.6.12; python_version>="3.9"
+coverage==7.7.1; python_version>="3.9"
 coverage==7.6.1; python_version<"3.9"
 pytest-cov==6.0.0; python_version>="3.9"
 pytest-cov==5.0.0; python_version<"3.9"
@@ -10,12 +10,12 @@ 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==309.0.0.20250311; python_version>="3.9"
+types-pywin32==310.0.0.20250319; python_version>="3.9"
 types-pywin32==308.0.0.20241221; python_version<"3.9"
-types-PyYAML==6.0.12.20241230
+types-PyYAML==6.0.12.20250326
 types-chevron==0.14.2.20250103
 types-psutil==7.0.0.20250218
-types-setuptools==76.0.0.20250313
+types-setuptools==77.0.2.20250328
 types-Pygments==2.19.0.20250305 
 types-colorama==0.4.15.20240311
 types-dateparser==1.2.0.20250208
@@ -25,7 +25,7 @@ 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.20250306; python_version>="3.10"
+types-requests==2.32.0.20250328; python_version>="3.10"
 types-urllib3==1.26.25.14
 
 # Test requirements
diff --git a/requirements/reproducible-linux.txt b/requirements/reproducible-linux.txt
@@ -22,9 +22,9 @@ aws-lambda-builders==1.54.0 \
     --hash=sha256:168ccca3ee70c68a499741ecf5dc984fc16b169ae7b95baf8118091315b42eb5 \
     --hash=sha256:c74353b6f4dfda981f3b01aa1e39180a492cbd323852122b6f6451faeb4d15f0
     # via aws-sam-cli (setup.py)
-aws-sam-translator==1.95.0 \
-    --hash=sha256:c9e0f22cbe83c768f7d20a3afb7e654bd6bfc087b387528bd48e98366b82ae40 \
-    --hash=sha256:fd2b891fc4cbdde1e06130eaf2710de5cc74442a656b7859b3840691144494cf
+aws-sam-translator==1.96.0 \
+    --hash=sha256:0c6c36dac13bff7df4f24896fa9ce3da2de4cdc4d10909e1fca7359ec5bc49c1 \
+    --hash=sha256:dd61017ec5cf35f69fbd596fade27d3e19959bba61f835ea0e083588bbcdfc70
     # via
     #   aws-sam-cli (setup.py)
     #   cfn-lint
@@ -129,9 +129,9 @@ cffi==1.17.1 \
     --hash=sha256:f7f5baafcc48261359e14bcd6d9bff6d4b28d9103847c9e136694cb0501aef87 \
     --hash=sha256:fc48c783f9c87e60831201f2cce7f3b2e4846bf4d8728eabe54d60700b318a0b
     # via cryptography
-cfn-lint==1.32.1 \
-    --hash=sha256:10282c0ec7fc6391da4877d9381a6b954f3c54ddcc0d3c97ee86f4783b5ae680 \
-    --hash=sha256:a8ea63ac8daa69a66a54a796998362fd063d9ba1e9c1fc3c932213b0c027669c
+cfn-lint==1.32.3 \
+    --hash=sha256:94ec87e9186dc2cd7d718eb14b4330cbc77889753310fa35600d8c94470bf8d5 \
+    --hash=sha256:a5723e7c7ef537d70b098d43f42f9670ea9856cb21d1699efd7fd9e3aaab26c1
     # via aws-sam-cli (setup.py)
 chardet==5.2.0 \
     --hash=sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7 \
diff --git a/requirements/reproducible-mac.txt b/requirements/reproducible-mac.txt
@@ -22,9 +22,9 @@ aws-lambda-builders==1.54.0 \
     --hash=sha256:168ccca3ee70c68a499741ecf5dc984fc16b169ae7b95baf8118091315b42eb5 \
     --hash=sha256:c74353b6f4dfda981f3b01aa1e39180a492cbd323852122b6f6451faeb4d15f0
     # via aws-sam-cli (setup.py)
-aws-sam-translator==1.95.0 \
-    --hash=sha256:c9e0f22cbe83c768f7d20a3afb7e654bd6bfc087b387528bd48e98366b82ae40 \
-    --hash=sha256:fd2b891fc4cbdde1e06130eaf2710de5cc74442a656b7859b3840691144494cf
+aws-sam-translator==1.96.0 \
+    --hash=sha256:0c6c36dac13bff7df4f24896fa9ce3da2de4cdc4d10909e1fca7359ec5bc49c1 \
+    --hash=sha256:dd61017ec5cf35f69fbd596fade27d3e19959bba61f835ea0e083588bbcdfc70
     # via
     #   aws-sam-cli (setup.py)
     #   cfn-lint
@@ -129,9 +129,9 @@ cffi==1.17.1 \
     --hash=sha256:f7f5baafcc48261359e14bcd6d9bff6d4b28d9103847c9e136694cb0501aef87 \
     --hash=sha256:fc48c783f9c87e60831201f2cce7f3b2e4846bf4d8728eabe54d60700b318a0b
     # via cryptography
-cfn-lint==1.32.1 \
-    --hash=sha256:10282c0ec7fc6391da4877d9381a6b954f3c54ddcc0d3c97ee86f4783b5ae680 \
-    --hash=sha256:a8ea63ac8daa69a66a54a796998362fd063d9ba1e9c1fc3c932213b0c027669c
+cfn-lint==1.32.3 \
+    --hash=sha256:94ec87e9186dc2cd7d718eb14b4330cbc77889753310fa35600d8c94470bf8d5 \
+    --hash=sha256:a5723e7c7ef537d70b098d43f42f9670ea9856cb21d1699efd7fd9e3aaab26c1
     # via aws-sam-cli (setup.py)
 chardet==5.2.0 \
     --hash=sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7 \
diff --git a/requirements/reproducible-win.txt b/requirements/reproducible-win.txt
@@ -22,9 +22,9 @@ aws-lambda-builders==1.54.0 \
     --hash=sha256:168ccca3ee70c68a499741ecf5dc984fc16b169ae7b95baf8118091315b42eb5 \
     --hash=sha256:c74353b6f4dfda981f3b01aa1e39180a492cbd323852122b6f6451faeb4d15f0
     # via aws-sam-cli (setup.py)
-aws-sam-translator==1.95.0 \
-    --hash=sha256:c9e0f22cbe83c768f7d20a3afb7e654bd6bfc087b387528bd48e98366b82ae40 \
-    --hash=sha256:fd2b891fc4cbdde1e06130eaf2710de5cc74442a656b7859b3840691144494cf
+aws-sam-translator==1.96.0 \
+    --hash=sha256:0c6c36dac13bff7df4f24896fa9ce3da2de4cdc4d10909e1fca7359ec5bc49c1 \
+    --hash=sha256:dd61017ec5cf35f69fbd596fade27d3e19959bba61f835ea0e083588bbcdfc70
     # via
     #   aws-sam-cli (setup.py)
     #   cfn-lint
@@ -129,9 +129,9 @@ cffi==1.17.1 \
     --hash=sha256:f7f5baafcc48261359e14bcd6d9bff6d4b28d9103847c9e136694cb0501aef87 \
     --hash=sha256:fc48c783f9c87e60831201f2cce7f3b2e4846bf4d8728eabe54d60700b318a0b
     # via cryptography
-cfn-lint==1.32.1 \
-    --hash=sha256:10282c0ec7fc6391da4877d9381a6b954f3c54ddcc0d3c97ee86f4783b5ae680 \
-    --hash=sha256:a8ea63ac8daa69a66a54a796998362fd063d9ba1e9c1fc3c932213b0c027669c
+cfn-lint==1.32.3 \
+    --hash=sha256:94ec87e9186dc2cd7d718eb14b4330cbc77889753310fa35600d8c94470bf8d5 \
+    --hash=sha256:a5723e7c7ef537d70b098d43f42f9670ea9856cb21d1699efd7fd9e3aaab26c1
     # via aws-sam-cli (setup.py)
 chardet==5.2.0 \
     --hash=sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7 \
diff --git a/samcli/__init__.py b/samcli/__init__.py
@@ -2,4 +2,4 @@
 SAM CLI version
 """
 
-__version__ = "1.136.0"
+__version__ = "1.137.0"
diff --git a/tests/integration/validate/test_validate_command.py b/tests/integration/validate/test_validate_command.py
@@ -157,7 +157,7 @@ def test_lint_deprecated_runtimes(self, runtime):
             self.assertEqual(command_result.process.returncode, 1)
             self.assertRegex(
                 output,
-                f"\\[\\[E2531: Validate if lambda runtime is deprecated\\] "
+                f"\\[\\[W2531: Check if EOL Lambda Function Runtimes are used] "
                 f"\\(Runtime '{runtime}' was deprecated on.*",
             )
 
@@ -243,9 +243,9 @@ def test_lint_invalid_template(self):
 
         warning_message = (
             "[[E0000: Parsing error found when parsing the template] "
-            '(Duplicate found "HelloWorldFunction" (line 5)) matched 5, '
+            "(Duplicate found 'HelloWorldFunction' (line 5)) matched 5, "
             "[E0000: Parsing error found when parsing the template] "
-            '(Duplicate found "HelloWorldFunction" (line 12)) matched 12]\n'
+            "(Duplicate found 'HelloWorldFunction' (line 12)) matched 12]\n"
         )
 
         self.assertIn(warning_message, output)
