Merge branch 'dependabot/pip/ruff-0.15.0' into integration

This commit is contained in:
J. Nick Koston
2026-02-04 09:31:37 +01:00
16 changed files with 84 additions and 83 deletions
+1 -1
View File
@@ -280,7 +280,7 @@ class TypeInfo(ABC):
"""
field_id_size = self.calculate_field_id_size()
method = f"{base_method}_force" if force else base_method
value = value_expr if value_expr else name
value = value_expr or name
return f"size.{method}({field_id_size}, {value});"
@abstractmethod
+1 -1
View File
@@ -249,7 +249,7 @@ def merge_component_configs(
if all_packages is None:
# First component - initialize package dict
all_packages = comp_packages if comp_packages else {}
all_packages = comp_packages or {}
elif comp_packages:
# Merge packages - combine all unique package types
# If both have the same package type, verify they're identical