Merge branch 'develop' into dependabot/pip/requirements/develop/black-25.1.0

Author: vicheey

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.96.0
+aws-sam-translator==1.97.0
 #docker minor version updates can include breaking changes. Auto update micro version only.
 docker~=7.1.0
 dateparser~=1.2

requirements/dev.txt

@@ -2,7 +2,7 @@
 
 coverage==7.8.0; python_version>="3.9"
 coverage==7.6.1; python_version<"3.9"
-pytest-cov==6.0.0; python_version>="3.9"
+pytest-cov==6.1.1; python_version>="3.9"
 pytest-cov==5.0.0; python_version<"3.9"
 
 
@@ -12,13 +12,13 @@ pytest-cov==5.0.0; python_version<"3.9"
 mypy==1.15.0
 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.20250326
+types-PyYAML==6.0.12.20250402
 types-chevron==0.14.2.20250103
-types-psutil==7.0.0.20250218
-types-setuptools==77.0.2.20250328
+types-psutil==7.0.0.20250401
+types-setuptools==78.1.0.20250329
 types-Pygments==2.19.0.20250305 
 types-colorama==0.4.15.20240311
-types-dateparser==1.2.0.20250208
+types-dateparser==1.2.0.20250408
 types-docutils==0.21.0.20241128
 types-jsonschema==4.23.0.20241208
 types-pyOpenSSL==24.1.0.20240722

requirements/pre-dev.txt

@@ -1 +1 @@
-ruff==0.11.2
+ruff==0.11.5

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.96.0 \
-    --hash=sha256:0c6c36dac13bff7df4f24896fa9ce3da2de4cdc4d10909e1fca7359ec5bc49c1 \
-    --hash=sha256:dd61017ec5cf35f69fbd596fade27d3e19959bba61f835ea0e083588bbcdfc70
+aws-sam-translator==1.97.0 \
+    --hash=sha256:305701ab49eb546fd720b3682e99cadcd43539f4ddb8395ea03c90c9e14d3325 \
+    --hash=sha256:6f7ec94de0a9b220dd1f1a0bf7e2df95dd44a85592301ee830744da2f209b7e6
     # via
     #   aws-sam-cli (setup.py)
     #   cfn-lint

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.96.0 \
-    --hash=sha256:0c6c36dac13bff7df4f24896fa9ce3da2de4cdc4d10909e1fca7359ec5bc49c1 \
-    --hash=sha256:dd61017ec5cf35f69fbd596fade27d3e19959bba61f835ea0e083588bbcdfc70
+aws-sam-translator==1.97.0 \
+    --hash=sha256:305701ab49eb546fd720b3682e99cadcd43539f4ddb8395ea03c90c9e14d3325 \
+    --hash=sha256:6f7ec94de0a9b220dd1f1a0bf7e2df95dd44a85592301ee830744da2f209b7e6
     # via
     #   aws-sam-cli (setup.py)
     #   cfn-lint

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.96.0 \
-    --hash=sha256:0c6c36dac13bff7df4f24896fa9ce3da2de4cdc4d10909e1fca7359ec5bc49c1 \
-    --hash=sha256:dd61017ec5cf35f69fbd596fade27d3e19959bba61f835ea0e083588bbcdfc70
+aws-sam-translator==1.97.0 \
+    --hash=sha256:305701ab49eb546fd720b3682e99cadcd43539f4ddb8395ea03c90c9e14d3325 \
+    --hash=sha256:6f7ec94de0a9b220dd1f1a0bf7e2df95dd44a85592301ee830744da2f209b7e6
     # via
     #   aws-sam-cli (setup.py)
     #   cfn-lint

samcli/__init__.py

@@ -2,4 +2,4 @@
 SAM CLI version
 """
 
-__version__ = "1.137.0"
+__version__ = "1.137.1"

tests/end_to_end/test_runtimes_e2e.py

@@ -1,10 +1,8 @@
-from distutils.dir_util import copy_tree
+import shutil
+import os
 from unittest import skipIf
-
 import json
 from pathlib import Path
-
-import os
 from parameterized import parameterized_class
 
 from tests.end_to_end.end_to_end_base import EndToEndBase
@@ -181,7 +179,7 @@ def test_integration(self):
         with EndToEndTestContext(self.app_name) as e2e_context:
             project_path = str(self.e2e_test_data_path / "esbuild-datadog-integration")
             os.mkdir(e2e_context.project_directory)
-            copy_tree(project_path, e2e_context.project_directory)
+            shutil.copytree(project_path, e2e_context.project_directory, dirs_exist_ok=True)
             self.template_path = e2e_context.template_path
             build_command_list = self.get_command_list()
             deploy_command_list = self._get_deploy_command(stack_name)