Reformat code with upgraded version of black

.github/workflows/lint.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/setup-python@v2
       - uses: psf/black@stable
         with:
-          version: ~=23.11
+          version: ~=24.3.0
           src: "."
           options: "--check"
 

game/ato/closestairfields.py

@@ -1,4 +1,5 @@
 """Objective adjacency lists."""
+
 from __future__ import annotations
 
 from typing import Dict, Iterator, List, Optional, TYPE_CHECKING

game/ato/flightplans/flightplan.py

@@ -5,6 +5,7 @@
 type, and the size of the flight. The FlightPlanBuilder is responsible for
 generating the waypoints for the mission.
 """
+
 from __future__ import annotations
 
 import math

game/ato/flightplans/formation.py

@@ -30,8 +30,7 @@ class FormationLayout(LoiterLayout, ABC):
 class FormationFlightPlan(LoiterFlightPlan[LayoutT], ABC):
     @property
     @abstractmethod
-    def package_speed_waypoints(self) -> set[FlightWaypoint]:
-        ...
+    def package_speed_waypoints(self) -> set[FlightWaypoint]: ...
 
     @property
     def combat_speed_waypoints(self) -> set[FlightWaypoint]:
@@ -69,13 +68,11 @@ def travel_time_to_rendezvous(self) -> timedelta:
 
     @property
     @abstractmethod
-    def join_time(self) -> datetime:
-        ...
+    def join_time(self) -> datetime: ...
 
     @property
     @abstractmethod
-    def split_time(self) -> datetime:
-        ...
+    def split_time(self) -> datetime: ...
 
     def tot_for_waypoint(self, waypoint: FlightWaypoint) -> datetime | None:
         if waypoint == self.layout.join:

game/ato/flightplans/ibuilder.py

@@ -60,8 +60,7 @@ def theater(self) -> ConflictTheater:
         return self.flight.departure.theater
 
     @abstractmethod
-    def build(self, dump_debug_info: bool = False) -> FlightPlanT:
-        ...
+    def build(self, dump_debug_info: bool = False) -> FlightPlanT: ...
 
     @property
     def package(self) -> Package:

game/ato/flightplans/loiter.py

@@ -30,8 +30,7 @@ def hold_duration(self) -> timedelta:
 
     @property
     @abstractmethod
-    def push_time(self) -> datetime:
-        ...
+    def push_time(self) -> datetime: ...
 
     def depart_time_for_waypoint(self, waypoint: FlightWaypoint) -> datetime | None:
         if waypoint == self.layout.hold:

game/ato/flightplans/uizonedisplay.py

@@ -14,5 +14,4 @@ class UiZone:
 
 class UiZoneDisplay(abc.ABC):
     @abc.abstractmethod
-    def ui_zone(self) -> UiZone:
-        ...
+    def ui_zone(self) -> UiZone: ...

game/ato/flightstate/flightstate.py

@@ -57,14 +57,12 @@ def alive(self) -> bool:
 
     @property
     @abstractmethod
-    def cancelable(self) -> bool:
-        ...
+    def cancelable(self) -> bool: ...
 
     @abstractmethod
     def on_game_tick(
         self, events: GameUpdateEvents, time: datetime, duration: timedelta
-    ) -> None:
-        ...
+    ) -> None: ...
 
     @property
     def in_flight(self) -> bool:
@@ -95,17 +93,14 @@ def should_halt_sim(self) -> bool:
 
     @property
     @abstractmethod
-    def is_waiting_for_start(self) -> bool:
-        ...
+    def is_waiting_for_start(self) -> bool: ...
 
     @abstractmethod
-    def estimate_position(self) -> Point:
-        ...
+    def estimate_position(self) -> Point: ...
 
     @property
     @abstractmethod
-    def spawn_type(self) -> StartType:
-        ...
+    def spawn_type(self) -> StartType: ...
 
     def a2a_commit_region(self) -> Optional[ThreatPoly]:
         return None

game/ato/flightstate/inflight.py

@@ -67,16 +67,13 @@ def travel_time_between_waypoints(self) -> timedelta:
         )
 
     @abstractmethod
-    def estimate_position(self) -> Point:
-        ...
+    def estimate_position(self) -> Point: ...
 
     @abstractmethod
-    def estimate_altitude(self) -> tuple[Distance, str]:
-        ...
+    def estimate_altitude(self) -> tuple[Distance, str]: ...
 
     @abstractmethod
-    def estimate_speed(self) -> Speed:
-        ...
+    def estimate_speed(self) -> Speed: ...
 
     def estimate_fuel_at_current_waypoint(self) -> float:
         initial_fuel = super().estimate_fuel()

game/ato/iflightroster.py

@@ -9,26 +9,20 @@
 
 class IFlightRoster(ABC):
     @abstractmethod
-    def iter_pilots(self) -> Iterator[Pilot | None]:
-        ...
+    def iter_pilots(self) -> Iterator[Pilot | None]: ...
 
     @abstractmethod
-    def pilot_at(self, idx: int) -> Pilot | None:
-        ...
+    def pilot_at(self, idx: int) -> Pilot | None: ...
 
     @property
     @abstractmethod
-    def max_size(self) -> int:
-        ...
+    def max_size(self) -> int: ...
 
     @abstractmethod
-    def resize(self, new_size: int) -> None:
-        ...
+    def resize(self, new_size: int) -> None: ...
 
     @abstractmethod
-    def set_pilot(self, index: int, pilot: Optional[Pilot]) -> None:
-        ...
+    def set_pilot(self, index: int, pilot: Optional[Pilot]) -> None: ...
 
     @abstractmethod
-    def clear(self) -> None:
-        ...
+    def clear(self) -> None: ...

game/callsigns.py

@@ -1,4 +1,5 @@
 """Support for working with DCS group callsigns."""
+
 import logging
 import re
 from typing import Any

game/campaignloader/factionrecommendation.py

@@ -14,12 +14,10 @@ def __init__(self, name: str) -> None:
         self.name = name
 
     @abstractmethod
-    def register_campaign_specific_faction(self, factions: Factions) -> None:
-        ...
+    def register_campaign_specific_faction(self, factions: Factions) -> None: ...
 
     @abstractmethod
-    def get_faction(self, factions: Factions) -> Faction:
-        ...
+    def get_faction(self, factions: Factions) -> Faction: ...
 
     @staticmethod
     def from_field(

game/commander/tasks/frontlinestancetask.py

@@ -21,8 +21,7 @@ def __init__(self, front_line: FrontLine, player: bool) -> None:
 
     @property
     @abstractmethod
-    def stance(self) -> CombatStance:
-        ...
+    def stance(self) -> CombatStance: ...
 
     @staticmethod
     def management_allowed(state: TheaterState) -> bool:
@@ -49,8 +48,7 @@ def better_stance_already_set(self, state: TheaterState) -> bool:
 
     @property
     @abstractmethod
-    def have_sufficient_front_line_advantage(self) -> bool:
-        ...
+    def have_sufficient_front_line_advantage(self) -> bool: ...
 
     @property
     def ground_force_balance(self) -> float:

game/commander/tasks/packageplanningtask.py

@@ -54,8 +54,7 @@ def execute(self, coalition: Coalition) -> None:
         coalition.ato.add_package(self.package)
 
     @abstractmethod
-    def propose_flights(self) -> None:
-        ...
+    def propose_flights(self) -> None: ...
 
     def propose_flight(
         self,
@@ -118,9 +117,9 @@ def iter_iads_ranges(
         target_ranges: list[
             tuple[Union[IadsGroundObject, NavalGroundObject], Distance]
         ] = []
-        all_iads: Iterator[
-            Union[IadsGroundObject, NavalGroundObject]
-        ] = itertools.chain(state.enemy_air_defenses, state.enemy_ships)
+        all_iads: Iterator[Union[IadsGroundObject, NavalGroundObject]] = (
+            itertools.chain(state.enemy_air_defenses, state.enemy_ships)
+        )
         for target in all_iads:
             distance = meters(target.distance_to(self.target))
             if range_type is RangeType.Detection:

game/commander/tasks/theatercommandertask.py

@@ -12,5 +12,4 @@
 
 class TheaterCommanderTask(PrimitiveTask[TheaterState]):
     @abstractmethod
-    def execute(self, coalition: Coalition) -> None:
-        ...
+    def execute(self, coalition: Coalition) -> None: ...

game/commander/theatercommander.py

@@ -52,6 +52,7 @@
 
 https://en.wikipedia.org/wiki/Hierarchical_task_network
 """
+
 from __future__ import annotations
 
 from datetime import datetime

game/dcs/groundunittype.py

@@ -60,9 +60,9 @@ class GroundUnitType(UnitType[Type[VehicleType]]):
     reversed_heading: bool = False
 
     _by_name: ClassVar[dict[str, GroundUnitType]] = {}
-    _by_unit_type: ClassVar[
-        dict[type[VehicleType], list[GroundUnitType]]
-    ] = defaultdict(list)
+    _by_unit_type: ClassVar[dict[type[VehicleType], list[GroundUnitType]]] = (
+        defaultdict(list)
+    )
 
     def __setstate__(self, state: dict[str, Any]) -> None:
         # Update any existing models with new data on load.

game/dcs/lasercodeconfig.py

@@ -17,12 +17,10 @@ def from_yaml(data: dict[str, Any]) -> LaserCodeConfig:
         )
 
     @abstractmethod
-    def iter_prop_ids(self) -> Iterator[str]:
-        ...
+    def iter_prop_ids(self) -> Iterator[str]: ...
 
     @abstractmethod
-    def property_dict_for_code(self, code: int) -> dict[str, int]:
-        ...
+    def property_dict_for_code(self, code: int) -> dict[str, int]: ...
 
 
 class SinglePropertyLaserCodeConfig(LaserCodeConfig):

game/flightplan/waypointactions/waypointaction.py

@@ -15,15 +15,12 @@
 
 class WaypointAction(ABC):
     @abstractmethod
-    def describe(self) -> str:
-        ...
+    def describe(self) -> str: ...
 
     @abstractmethod
     def update_state(
         self, state: ActionState, time: datetime, duration: timedelta
-    ) -> timedelta:
-        ...
+    ) -> timedelta: ...
 
     @abstractmethod
-    def iter_tasks(self, ctx: TaskContext) -> Iterator[Task]:
-        ...
+    def iter_tasks(self, ctx: TaskContext) -> Iterator[Task]: ...

game/flightplan/waypointstrategy.py

@@ -28,14 +28,12 @@ def point_at_heading(p: Point, heading: Heading, distance: Distance) -> Point:
 
 class Prerequisite(ABC):
     @abstractmethod
-    def is_satisfied(self) -> bool:
-        ...
+    def is_satisfied(self) -> bool: ...
 
     @abstractmethod
     def describe_debug_info(
         self, to_geojson: Callable[[BaseGeometry], dict[str, Any]]
-    ) -> dict[str, Any]:
-        ...
+    ) -> dict[str, Any]: ...
 
 
 class DistancePrerequisite(Prerequisite):

game/htn.py

@@ -11,8 +11,7 @@
 
 class WorldState(ABC, Generic[WorldStateT]):
     @abstractmethod
-    def clone(self) -> WorldStateT:
-        ...
+    def clone(self) -> WorldStateT: ...
 
 
 class Task(Generic[WorldStateT]):
@@ -24,18 +23,17 @@ class Task(Generic[WorldStateT]):
 
 class PrimitiveTask(Task[WorldStateT], Generic[WorldStateT], ABC):
     @abstractmethod
-    def preconditions_met(self, state: WorldStateT) -> bool:
-        ...
+    def preconditions_met(self, state: WorldStateT) -> bool: ...
 
     @abstractmethod
-    def apply_effects(self, state: WorldStateT) -> None:
-        ...
+    def apply_effects(self, state: WorldStateT) -> None: ...
 
 
 class CompoundTask(Task[WorldStateT], Generic[WorldStateT], ABC):
     @abstractmethod
-    def each_valid_method(self, state: WorldStateT) -> Iterator[Method[WorldStateT]]:
-        ...
+    def each_valid_method(
+        self, state: WorldStateT
+    ) -> Iterator[Method[WorldStateT]]: ...
 
 
 PrimitiveTaskT = TypeVar("PrimitiveTaskT", bound=PrimitiveTask[Any])

game/infos/information.py

@@ -10,9 +10,11 @@ def __init__(self, title: str = "", text: str = "", turn: int = 0) -> None:
 
     def __str__(self) -> str:
         return "[{}][{}] {} {}".format(
-            self.timestamp.strftime("%Y-%m-%d %H:%M:%S")
-            if self.timestamp is not None
-            else "",
+            (
+                self.timestamp.strftime("%Y-%m-%d %H:%M:%S")
+                if self.timestamp is not None
+                else ""
+            ),
             self.turn,
             self.title,
             self.text,

game/lasercodes/ilasercoderegistry.py

@@ -9,9 +9,7 @@
 
 class ILaserCodeRegistry(ABC):
     @abstractmethod
-    def alloc_laser_code(self) -> LaserCode:
-        ...
+    def alloc_laser_code(self) -> LaserCode: ...
 
     @abstractmethod
-    def release_code(self, code: LaserCode) -> None:
-        ...
+    def release_code(self, code: LaserCode) -> None: ...

game/logging_config.py

@@ -1,4 +1,5 @@
 """Logging APIs."""
+
 import logging
 import logging.config
 import os

game/missiongenerator/briefinggenerator.py

@@ -1,6 +1,7 @@
 """
 Briefing generation logic
 """
+
 from __future__ import annotations
 
 import os

game/missiongenerator/kneeboard.py

@@ -22,6 +22,7 @@
 only be added per airframe, so PvP missions where each side have the same
 aircraft will be able to see the enemy's kneeboard for the same airframe.
 """
+
 import datetime
 import math
 import textwrap