Merge branch 'develop' into dependabot/pip/develop/black-26.3.0

Author: Vandita2020

pyproject.toml

@@ -39,7 +39,7 @@ dependencies = [
     "jmespath~=1.1.0",
     "ruamel_yaml~=0.19.1",
     "PyYAML~=6.0",
-    "cookiecutter~=2.6.0",
+    "cookiecutter>=2.6,<2.8",
     "aws-sam-translator==1.107.0",
     # docker minor version updates can include breaking changes. Auto update micro version only.
     "docker~=7.1.0",
@@ -56,14 +56,14 @@ dependencies = [
     # regex is not a direct dependency of SAM CLI, exclude version 2021.10.8 due to not working on M1 Mac
     "regex!=2021.10.8",
     "tzlocal==5.3.1",
-    "cfn-lint~=1.45.0",
+    "cfn-lint>=1.45,<1.47",
     "boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]>=1.41.0",
     "python-dotenv~=1.0.0",
 ]
 
 [project.optional-dependencies]
 pre-dev = [
-    "ruff==0.15.4",
+    "ruff==0.15.5",
 ]
 dev = [
     "aws-sam-cli[pre-dev]",
@@ -91,7 +91,7 @@ dev = [
     "pytest-rerunfailures==16.1",
     "pytest-metadata==3.1.1",
     "pytest-json-report-wip==1.5.1",
-    "filelock==3.25.0",
+    "filelock==3.25.1",
     "black==26.3.0",
     "psutil==7.2.2",
     "chardet<6",

requirements/pyinstaller-build.txt

@@ -1,3 +1,3 @@
 # Executable binary builder requirements
-setuptools==82.0.0
+setuptools==82.0.1
 pyinstaller==6.19.0

requirements/reproducible-linux.txt

@@ -184,9 +184,9 @@ cffi==2.0.0 \
     --hash=sha256:fc7de24befaeae77ba923797c7c87834c73648a05a4bde34b3b7e5588973a453 \
     --hash=sha256:fe562eb1a64e67dd297ccc4f5addea2501664954f2692b69a76449ec7913ecbf
     # via cryptography
-cfn-lint==1.45.0 \
-    --hash=sha256:0a05b34eff63f45d7b9b0465e01dca6c2035b730bd88910dca8c4bcf00913939 \
-    --hash=sha256:39aed0cdb3be4d09fad4ca4e410790313c1b6a4e4a9f0362dac1b1980dd48978
+cfn-lint==1.46.0 \
+    --hash=sha256:1dfca1993af3159411e4a4f79466617ccdca48eddaf424e216297167c500aa3b \
+    --hash=sha256:fa7cb76db683109133241baf1e1734b1d61b46d3900ba2a309db8f3d0e5d3994
     # via aws-sam-cli (pyproject.toml)
 chardet==5.2.0 \
     --hash=sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7 \
@@ -318,9 +318,9 @@ click==8.1.8 \
     #   aws-sam-cli (pyproject.toml)
     #   cookiecutter
     #   flask
-cookiecutter==2.6.0 \
-    --hash=sha256:a54a8e37995e4ed963b3e82831072d1ad4b005af736bb17b99c2cbd9d41b6e2d \
-    --hash=sha256:db21f8169ea4f4fdc2408d48ca44859349de2647fbe494a9d6c3edfc0542c21c
+cookiecutter==2.7.1 \
+    --hash=sha256:ca7bb7bc8c6ff441fbf53921b5537668000e38d56e28d763a1b73975c66c6138 \
+    --hash=sha256:cee50defc1eaa7ad0071ee9b9893b746c1b3201b66bf4d3686d0f127c8ed6cf9
     # via aws-sam-cli (pyproject.toml)
 cryptography==46.0.5 \
     --hash=sha256:02f547fce831f5096c9a567fd41bc12ca8f11df260959ecc7c3202555cc47a72 \
@@ -1095,9 +1095,9 @@ s3transfer==0.16.0 \
     --hash=sha256:18e25d66fed509e3868dc1572b3f427ff947dd2c56f844a5bf09481ad3f3b2fe \
     --hash=sha256:8e990f13268025792229cd52fa10cb7163744bf56e719e0b9cb925ab79abf920
     # via boto3
-setuptools==82.0.0 \
-    --hash=sha256:22e0a2d69474c6ae4feb01951cb69d515ed23728cf96d05513d36e42b62b37cb \
-    --hash=sha256:70b18734b607bd1da571d097d236cfcfacaf01de45717d59e6e04b96877532e0
+setuptools==82.0.1 \
+    --hash=sha256:7d872682c5d01cfde07da7bccc7b65469d3dca203318515ada1de5eda35efbf9 \
+    --hash=sha256:a59e362652f08dcd477c78bb6e7bd9d80a7995bc73ce773050228a348ce2e5bb
     # via aws-lambda-builders
 six==1.17.0 \
     --hash=sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274 \

requirements/reproducible-mac.txt

@@ -184,9 +184,9 @@ cffi==2.0.0 \
     --hash=sha256:fc7de24befaeae77ba923797c7c87834c73648a05a4bde34b3b7e5588973a453 \
     --hash=sha256:fe562eb1a64e67dd297ccc4f5addea2501664954f2692b69a76449ec7913ecbf
     # via cryptography
-cfn-lint==1.45.0 \
-    --hash=sha256:0a05b34eff63f45d7b9b0465e01dca6c2035b730bd88910dca8c4bcf00913939 \
-    --hash=sha256:39aed0cdb3be4d09fad4ca4e410790313c1b6a4e4a9f0362dac1b1980dd48978
+cfn-lint==1.46.0 \
+    --hash=sha256:1dfca1993af3159411e4a4f79466617ccdca48eddaf424e216297167c500aa3b \
+    --hash=sha256:fa7cb76db683109133241baf1e1734b1d61b46d3900ba2a309db8f3d0e5d3994
     # via aws-sam-cli (pyproject.toml)
 chardet==5.2.0 \
     --hash=sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7 \
@@ -318,9 +318,9 @@ click==8.1.8 \
     #   aws-sam-cli (pyproject.toml)
     #   cookiecutter
     #   flask
-cookiecutter==2.6.0 \
-    --hash=sha256:a54a8e37995e4ed963b3e82831072d1ad4b005af736bb17b99c2cbd9d41b6e2d \
-    --hash=sha256:db21f8169ea4f4fdc2408d48ca44859349de2647fbe494a9d6c3edfc0542c21c
+cookiecutter==2.7.1 \
+    --hash=sha256:ca7bb7bc8c6ff441fbf53921b5537668000e38d56e28d763a1b73975c66c6138 \
+    --hash=sha256:cee50defc1eaa7ad0071ee9b9893b746c1b3201b66bf4d3686d0f127c8ed6cf9
     # via aws-sam-cli (pyproject.toml)
 cryptography==46.0.5 \
     --hash=sha256:02f547fce831f5096c9a567fd41bc12ca8f11df260959ecc7c3202555cc47a72 \
@@ -1095,9 +1095,9 @@ s3transfer==0.16.0 \
     --hash=sha256:18e25d66fed509e3868dc1572b3f427ff947dd2c56f844a5bf09481ad3f3b2fe \
     --hash=sha256:8e990f13268025792229cd52fa10cb7163744bf56e719e0b9cb925ab79abf920
     # via boto3
-setuptools==82.0.0 \
-    --hash=sha256:22e0a2d69474c6ae4feb01951cb69d515ed23728cf96d05513d36e42b62b37cb \
-    --hash=sha256:70b18734b607bd1da571d097d236cfcfacaf01de45717d59e6e04b96877532e0
+setuptools==82.0.1 \
+    --hash=sha256:7d872682c5d01cfde07da7bccc7b65469d3dca203318515ada1de5eda35efbf9 \
+    --hash=sha256:a59e362652f08dcd477c78bb6e7bd9d80a7995bc73ce773050228a348ce2e5bb
     # via aws-lambda-builders
 six==1.17.0 \
     --hash=sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274 \

requirements/reproducible-win.txt

@@ -184,9 +184,9 @@ cffi==2.0.0 \
     --hash=sha256:fc7de24befaeae77ba923797c7c87834c73648a05a4bde34b3b7e5588973a453 \
     --hash=sha256:fe562eb1a64e67dd297ccc4f5addea2501664954f2692b69a76449ec7913ecbf
     # via cryptography
-cfn-lint==1.45.0 \
-    --hash=sha256:0a05b34eff63f45d7b9b0465e01dca6c2035b730bd88910dca8c4bcf00913939 \
-    --hash=sha256:39aed0cdb3be4d09fad4ca4e410790313c1b6a4e4a9f0362dac1b1980dd48978
+cfn-lint==1.46.0 \
+    --hash=sha256:1dfca1993af3159411e4a4f79466617ccdca48eddaf424e216297167c500aa3b \
+    --hash=sha256:fa7cb76db683109133241baf1e1734b1d61b46d3900ba2a309db8f3d0e5d3994
     # via aws-sam-cli (pyproject.toml)
 chardet==5.2.0 \
     --hash=sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7 \
@@ -322,9 +322,9 @@ colorama==0.4.6 \
     --hash=sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 \
     --hash=sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6
     # via click
-cookiecutter==2.6.0 \
-    --hash=sha256:a54a8e37995e4ed963b3e82831072d1ad4b005af736bb17b99c2cbd9d41b6e2d \
-    --hash=sha256:db21f8169ea4f4fdc2408d48ca44859349de2647fbe494a9d6c3edfc0542c21c
+cookiecutter==2.7.1 \
+    --hash=sha256:ca7bb7bc8c6ff441fbf53921b5537668000e38d56e28d763a1b73975c66c6138 \
+    --hash=sha256:cee50defc1eaa7ad0071ee9b9893b746c1b3201b66bf4d3686d0f127c8ed6cf9
     # via aws-sam-cli (pyproject.toml)
 cryptography==46.0.5 \
     --hash=sha256:02f547fce831f5096c9a567fd41bc12ca8f11df260959ecc7c3202555cc47a72 \
@@ -1121,9 +1121,9 @@ s3transfer==0.16.0 \
     --hash=sha256:18e25d66fed509e3868dc1572b3f427ff947dd2c56f844a5bf09481ad3f3b2fe \
     --hash=sha256:8e990f13268025792229cd52fa10cb7163744bf56e719e0b9cb925ab79abf920
     # via boto3
-setuptools==82.0.0 \
-    --hash=sha256:22e0a2d69474c6ae4feb01951cb69d515ed23728cf96d05513d36e42b62b37cb \
-    --hash=sha256:70b18734b607bd1da571d097d236cfcfacaf01de45717d59e6e04b96877532e0
+setuptools==82.0.1 \
+    --hash=sha256:7d872682c5d01cfde07da7bccc7b65469d3dca203318515ada1de5eda35efbf9 \
+    --hash=sha256:a59e362652f08dcd477c78bb6e7bd9d80a7995bc73ce773050228a348ce2e5bb
     # via aws-lambda-builders
 six==1.17.0 \
     --hash=sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274 \

tests/integration/pipeline/base.py

@@ -65,13 +65,32 @@ def setUp(self):
         super().setUp()
         shutil.rmtree(os.path.join(os.getcwd(), ".aws-sam", "pipeline"), ignore_errors=True)
 
+    # Max time in seconds to wait for each stack deletion to complete
+    STACK_DELETE_TIMEOUT_SECONDS = 180
+
     def tearDown(self):
         for stack_name in self.stack_names:
             self._cleanup_s3_buckets(stack_name)
             self.cf_client.delete_stack(StackName=stack_name)
+        self._wait_for_stack_deletions()
         shutil.rmtree(os.path.join(os.getcwd(), ".aws-sam", "pipeline"), ignore_errors=True)
         super().tearDown()
 
+    def _wait_for_stack_deletions(self):
+        """Wait for all stack deletions to complete so subsequent runs don't collide."""
+        waiter = self.cf_client.get_waiter("stack_delete_complete")
+        for stack_name in self.stack_names:
+            try:
+                waiter.wait(
+                    StackName=stack_name,
+                    WaiterConfig={
+                        "Delay": 10,
+                        "MaxAttempts": self.STACK_DELETE_TIMEOUT_SECONDS // 10,
+                    },
+                )
+            except botocore.exceptions.WaiterError:
+                logging.warning("Timed out waiting for stack %s to delete", stack_name)
+
     def _cleanup_s3_buckets(self, stack_name):
         try:
             stack_resources = self.cf_client.describe_stack_resources(StackName=stack_name)

tests/integration/sync/test_sync_build_in_source.py

@@ -33,6 +33,9 @@ def tearDown(self):
             if os.path.isfile(path):
                 os.remove(path)
 
+        # Clear the build cache so reruns re-execute the Makefile and recreate marker files
+        shutil.rmtree(self.test_data_path.joinpath(".aws-sam"), ignore_errors=True)
+
     @parameterized.expand(
         [
             (True, True),  # build in source
@@ -94,6 +97,9 @@ def tearDown(self):
             if os.path.isfile(path):
                 os.remove(path)
 
+        # Clear the build cache so reruns re-execute the Makefile and recreate marker files
+        shutil.rmtree(Path(self.test_data_path, ".aws-sam"), ignore_errors=True)
+
     @parameterized.expand(
         [
             (True, True),  # build in source