Refactor: Updates and fixes for Ruff 0.15.0 (#6499)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Mahesh Kumar <122076792+MaheshGSLAB@users.noreply.github.com>
Co-authored-by: MaheshGSLAB <mahesh.kumar-ext@arista.com>

Author: pre-commit-ci[bot]

.github/generate_release.py

@@ -85,7 +85,7 @@ def increase_indent(self, flow: bool = False, *_args: Any, **_kwargs: Any) -> No
     # First add Breaking Changes EXCEPT `pyavd`
     # TODO: should we consider changing this and adding back pyavd?
     breaking_label_categories = ["Feat", "Fix", "Cut", "Revert", "Refactor", "Bump"]
-    breaking_labels = [f"rn: {cc_type}({scope})!" for cc_type in breaking_label_categories for scope in SCOPES if scope not in ["pyavd"]]
+    breaking_labels = [f"rn: {cc_type}({scope})!" for cc_type in breaking_label_categories for scope in SCOPES if scope != "pyavd"]
     breaking_labels.extend([f"rn: {cc_type}!" for cc_type in breaking_label_categories])
 
     categories_list.append(

.pre-commit-config.yaml

@@ -110,7 +110,7 @@ repos:
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.14.14
+    rev: v0.15.0
     hooks:
       # Run the linter.
       - id: ruff

ansible_collections/arista/avd/extensions/scripts/processor.py

@@ -139,7 +139,7 @@ def process_config(config_path: str, output_dir: str | None = None) -> None:
 
         # Use job-specific output_dir if provided, otherwise use the global one
         job_output_dir: str | None = job.get("output_dir")
-        final_output_dir: str | None = job_output_dir if job_output_dir else output_dir
+        final_output_dir: str | None = job_output_dir or output_dir
 
         if not final_output_dir:
             logger.error("ERROR: No output_dir specified for artifact '%s'", artifact_filename)

python-avd/pyavd/_cv/client/__init__.py

@@ -107,7 +107,7 @@ async def proxy_connection() -> H2Protocol:
 
                 # Create the gRPC protocol using the proxy socket
                 _, protocol = await loop.create_connection(
-                    lambda: channel._protocol_factory(),
+                    channel._protocol_factory,
                     sock=proxy_sock,
                     ssl=channel._ssl,
                     server_hostname=self._servers[0] if ssl_context else None,

python-avd/pyavd/_cv/client/configlet.py

@@ -3,7 +3,7 @@
 # that can be found in the LICENSE file.
 from __future__ import annotations
 
-from asyncio import gather
+from asyncio import gather, to_thread
 from logging import getLogger
 from pathlib import Path
 from typing import TYPE_CHECKING, Literal, Protocol
@@ -349,7 +349,7 @@ async def set_configlet_from_file(
                 key=ConfigletKey(workspace_id=workspace_id, configlet_id=configlet_id),
                 display_name=display_name,
                 description=description,
-                body=Path(file).read_text(encoding="UTF-8"),
+                body=await to_thread(Path.read_text, Path(file), encoding="UTF-8"),
             ),
         )
         client = ConfigletConfigServiceStub(self._channel)
@@ -384,7 +384,7 @@ async def set_configlets_from_files(
                     key=ConfigletKey(workspace_id=workspace_id, configlet_id=configlet_id),
                     display_name=display_name,
                     description=description,
-                    body=Path(file).read_text(encoding="UTF-8"),
+                    body=await to_thread(Path.read_text, Path(file), encoding="UTF-8"),
                 )
             )
         client = ConfigletConfigServiceStub(self._channel)

python-avd/pyavd/_eos_designs/structured_config/base/platform_mixin.py

@@ -115,7 +115,7 @@ def _build_interface_with_rx_queue_settings(
             name=l3_ethernet_interface.name,
             rx_queue=EosCliConfigGen.Platform.Sfe.Interface.ProfilesItem.InterfacesItem.RxQueue(
                 count=l3_ethernet_interface.rx_queue.count,
-                worker=rx_queue_workers_range if rx_queue_workers_range else None,
+                worker=rx_queue_workers_range or None,
                 mode=l3_ethernet_interface.rx_queue.mode,
             ),
         )

python-avd/pyavd/_eos_designs/structured_config/network_services/ethernet_interfaces.py

@@ -74,7 +74,7 @@ def _set_l3_port_channel_members(
                 interface_description = member_intf.description
                 # derive values for peer from parent L3 port-channel
                 # if not defined explicitly for member interface
-                peer = member_intf.peer if member_intf.peer else l3_port_channel.peer
+                peer = member_intf.peer or l3_port_channel.peer
                 if not interface_description:
                     elems = [peer, member_intf.peer_interface]
                     if elems:
@@ -84,7 +84,7 @@ def _set_l3_port_channel_members(
                     name=member_intf.name,
                     description=interface_description or None,
                     shutdown=not l3_port_channel.enabled,
-                    speed=member_intf.speed if member_intf.speed else None,
+                    speed=member_intf.speed or None,
                 )
                 ethernet_interface.metadata._update(peer_interface=member_intf.peer_interface or None, peer_type="l3_port_channel_member", peer=peer or None)
                 ethernet_interface.channel_group.id = int(channel_group_id)

python-avd/pyavd/_eos_designs/structured_config/network_services/port_channel_interfaces.py

@@ -131,7 +131,7 @@ def _set_l3_port_channels(
                     vrf=vrf.name if vrf.name != "default" else None,
                 )
                 port_channel_interface.metadata._update(
-                    peer_interface=l3_port_channel.peer_port_channel if l3_port_channel.peer_port_channel else None,
+                    peer_interface=l3_port_channel.peer_port_channel or None,
                     peer=l3_port_channel.peer,
                     peer_type="l3_port_channel",
                 )

python-avd/pyavd/_eos_designs/structured_config/underlay/ethernet_interfaces.py

@@ -325,7 +325,7 @@ def _set_l3_port_channel_member_ports(
         for member_intf in l3_port_channel.member_interfaces:
             # derive values for peer from parent L3 port-channel
             # if not defined explicitly for member interface
-            peer = member_intf.peer if member_intf.peer else l3_port_channel.peer
+            peer = member_intf.peer or l3_port_channel.peer
             interface_description = self.shared_utils.interface_descriptions.underlay_ethernet_interface(
                 InterfaceDescriptionData(
                     shared_utils=self.shared_utils,
@@ -339,7 +339,7 @@ def _set_l3_port_channel_member_ports(
                 name=member_intf.name,
                 description=interface_description or None,
                 shutdown=not l3_port_channel.enabled,
-                speed=member_intf.speed if member_intf.speed else None,
+                speed=member_intf.speed or None,
                 channel_group=EosCliConfigGen.EthernetInterfacesItem.ChannelGroup(id=int(channel_group_id), mode=l3_port_channel.mode),
             )
             ethernet_interface.metadata._update(peer_interface=member_intf.peer_interface, peer_type="l3_port_channel_member", peer=peer)