Merge branch 'develop' into fix/comma-delimited-list-output-collision

Author: roger-zhangg

.github/workflows/validate_pyinstaller.yml

@@ -8,6 +8,9 @@ on:
 env:
   CI_OVERRIDE: "1"
 
+permissions:
+  contents: read
+
 jobs:
   build-for-linux:
     name: build-pyinstaller-linux

pyproject.toml

@@ -35,7 +35,7 @@ dependencies = [
     "chevron~=0.12",
     "click==8.1.8",
     "Flask<3.2",
-    "boto3[crt]==1.43.6",
+    "boto3[crt]==1.43.7",
     "jmespath~=1.1.0",
     "ruamel_yaml~=0.19.1",
     "PyYAML~=6.0",
@@ -46,7 +46,7 @@ dependencies = [
     "dateparser~=1.3",
     "requests>=2.32.5,<2.35.0",
     "aws_lambda_builders==1.64.0",
-    "tomlkit==0.14.0",
+    "tomlkit==0.15.0",
     "watchdog==4.0.2",
     "rich>=14.3.3,<15.1.0",
     "pyopenssl>=25.3,<26.3",
@@ -69,26 +69,26 @@ dev = [
     "aws-sam-cli[pre-dev]",
     "coverage==7.14.0",
     "pytest-cov==7.1.0",
-    "mypy==1.19.1",
+    "mypy==2.1.0",
     "types-pywin32==311.0.0.20260508",
-    "types-PyYAML==6.0.12.20250915",
-    "types-chevron==0.14.2.20250103",
-    "types-psutil==7.2.2.20260130",
-    "types-setuptools==82.0.0.20260408",
-    "types-Pygments==2.19.0.20251121",
+    "types-PyYAML==6.0.12.20260510",
+    "types-chevron==0.14.2.20260408",
+    "types-psutil==7.2.2.20260508",
+    "types-setuptools==82.0.0.20260508",
+    "types-Pygments==2.20.0.20260508",
     "types-colorama==0.4.15.20260508",
-    "types-dateparser==1.4.0.20260328",
+    "types-dateparser==1.4.0.20260508",
     "types-docutils==0.22.3.20260508",
-    "types-jsonschema==4.26.0.20260202",
+    "types-jsonschema==4.26.0.20260508",
     "types-pyOpenSSL==24.1.0.20240722",
-    "types-requests==2.33.0.20260327",
+    "types-requests==2.33.0.20260513",
     "types-urllib3==1.26.25.14",
     "pytest==9.0.3",
     "parameterized==0.9.0",
     "pytest-xdist==3.8.0",
     "pytest-forked==1.6.0",
     "pytest-timeout==2.4.0",
-    "pytest-rerunfailures==16.1",
+    "pytest-rerunfailures==16.2",
     "pytest-metadata==3.1.1",
     "pytest-json-report-wip==1.5.1",
     "filelock==3.29.0",

requirements/pyinstaller-build.txt

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

requirements/reproducible-linux.txt

@@ -2,4 +2,4 @@
 SAM CLI version
 """
 
-__version__ = "1.159.1"
+__version__ = "1.160.0"

requirements/reproducible-mac.txt

@@ -347,7 +347,7 @@ def __hash__(self) -> int:
     def __eq__(self, o: object) -> bool:
         if type(o) is not type(self):
             return False
-        return cast(bool, self._equality_keys() == cast(SyncFlow, o)._equality_keys())
+        return cast(bool, self._equality_keys() == o._equality_keys())
 
     @property
     def log_name(self) -> str:

requirements/reproducible-win.txt

@@ -42,7 +42,7 @@
 No side effect will result in this as it is write-only for code outside of telemetry.
 Decorators should be used to minimize logic involving telemetry.
 """
-_METRICS = dict()
+_METRICS: Dict[str, "Metric"] = dict()
 
 # Global container socket and runtime information for telemetry
 # This persists across context boundaries to ensure accurate telemetry reporting

samcli/__init__.py

@@ -386,7 +386,7 @@ def _get_definition_file(self) -> str:
         definition_file = self._resource.get("Properties", {}).get(property_name)
         if not definition_file or not isinstance(definition_file, str):
             raise MissingLocalDefinition(self._resource_identifier, property_name)
-        return cast(str, definition_file)
+        return definition_file
 
     def _validator_wrapper(self, event: Optional[FileSystemEvent] = None):
         """Wrapper for callback that only executes if the definition is valid and non-trivial changes are detected.