fix linting issues

Author: ImogenBits

.flake8

@@ -705,13 +705,13 @@ class Config(Battle.Config):
         """Number of fights that will be fought."""
         weighting: Annotated[float, Ge(0)] = 1.1
         """How much each successive fight should be weighted more than the previous."""
-        scores: set[Role] = {Role.generator, Role.solver}
+        scores: set[Role] = {Role.generator, Role.solver} # noqa: RUF012
         """Who to show each fight's scores to."""
-        instances: set[Role] = {Role.generator, Role.solver}
+        instances: set[Role] = {Role.generator, Role.solver} # noqa: RUF012
         """Who to show the instances to."""
-        generator_solutions: set[Role] = {Role.generator}
+        generator_solutions: set[Role] = {Role.generator} # noqa: RUF012
         """Who to show the generator's solutions to, if the problem requires them."""
-        solver_solutions: set[Role] = {Role.solver}
+        solver_solutions: set[Role] = {Role.solver} # noqa: RUF012
         """Who to show the solver's solutions to."""
 
     class UiData(Battle.UiData):

algobattle/battle.py

@@ -1,50 +1,40 @@
 """Module defining the Problem and Solution base classes and related objects."""
 from abc import ABC, abstractmethod
+from collections.abc import Callable
 from dataclasses import dataclass
 from functools import wraps
 from importlib.metadata import entry_points
 from inspect import Parameter, Signature, signature
 from itertools import chain
+from math import inf, isnan
 from pathlib import Path
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
     ClassVar,
+    Generic,
     Literal,
     ParamSpec,
     Protocol,
     Self,
-    Generic,
     TypeVar,
-    overload,
     cast,
     get_args,
+    overload,
     runtime_checkable,
 )
-from math import inf, isnan
-from annotated_types import GroupedMetadata
 
-from pydantic import (
-    GetCoreSchemaHandler,
-    ValidationInfo,
-)
+from annotated_types import GroupedMetadata
+from pydantic import GetCoreSchemaHandler, ValidationInfo
 from pydantic.main import BaseModel
 from pydantic_core import CoreSchema
 from pydantic_core.core_schema import (
+    ValidatorFunctionWrapHandler,
     with_info_after_validator_function,
     with_info_wrap_validator_function,
-    ValidatorFunctionWrapHandler,
 )
 
-from algobattle.util import (
-    EncodableBase,
-    EncodableModel,
-    EncodableModelBase,
-    Role,
-    Encodable,
-    import_file_as_module,
-)
+from algobattle.util import Encodable, EncodableBase, EncodableModel, EncodableModelBase, Role, import_file_as_module
 
 
 class Instance(Encodable, ABC):
@@ -72,12 +62,12 @@ def validate_instance(self) -> None:
 P = ParamSpec("P")
 
 
-class Solution(EncodableBase, Generic[InstanceT], ABC):
+class Solution(EncodableBase, ABC, Generic[InstanceT]):
     """A proposed solution for an instance of this problem."""
 
     @classmethod
     @abstractmethod
-    def decode(cls, source: Path, max_size: int, role: Role, instance: InstanceT) -> Self:  # noqa: D102
+    def decode(cls, source: Path, max_size: int, role: Role, instance: InstanceT) -> Self:
         raise NotImplementedError
 
     def validate_solution(self, instance: InstanceT, role: Role) -> None:
@@ -230,7 +220,7 @@ class Problem:
     """The definition of a problem."""
 
     @overload
-    def __init__(  # noqa: D107
+    def __init__(
         self,
         *,
         name: str,
@@ -244,7 +234,7 @@ def __init__(  # noqa: D107
         ...
 
     @overload
-    def __init__(  # noqa: D107
+    def __init__(
         self,
         *,
         name: str,
@@ -295,7 +285,7 @@ def __init__(
         self.test_instance = test_instance
         self._problems[name] = self
 
-    __slots__ = ("name", "instance_cls", "solution_cls", "min_size", "with_solution", "score_function", "test_instance")
+    __slots__ = ("instance_cls", "min_size", "name", "score_function", "solution_cls", "test_instance", "with_solution")
     _problems: ClassVar[dict[str, Self]] = {}
 
     @overload
@@ -376,7 +366,7 @@ def load(cls, name: str, file: Path | None = None) -> Self:
             case [e]:
                 loaded: object = e.load()
                 if not isinstance(loaded, cls):
-                    raise ValueError(
+                    raise ValueError( # noqa: TRY004
                         f"The entrypoint '{name}' doesn't point to a problem but a {loaded.__class__.__qualname__}."
                     )
                 return loaded
@@ -500,8 +490,8 @@ class AttributeReferenceMaker:
 
     _attr_ref_maker_model: ModelReference
 
-    def __getattr__(self, __name: str) -> AttributeReference:
-        return AttributeReference(self._attr_ref_maker_model, __name)
+    def __getattr__(self, name: str, /) -> AttributeReference:
+        return AttributeReference(self._attr_ref_maker_model, name)
 
 
 SelfRef = AttributeReferenceMaker("self")

algobattle/problem.py

@@ -438,7 +438,7 @@ def edge_set(self) -> set[tuple[Vertex, Vertex]]:
         """The set of edges in this graph."""
         return set(self.edges)
 
-    @cache
+    @cache # noqa: B019
     def neighbors(self, vertex: Vertex, direction: Literal["all", "outgoing", "incoming"] = "all") -> set[Vertex]:
         """The neighbors of a vertex."""
         res = set[Vertex]()
@@ -474,7 +474,7 @@ def edge_set(self) -> set[tuple[Vertex, Vertex]]:
         """
         return set(self.edges) | {(v, u) for (u, v) in self.edges}
 
-    @cache
+    @cache # noqa: B019
     def neighbors(self, vertex: Vertex, direction: Literal["all", "outgoing", "incoming"] = "all") -> set[Vertex]:
         """The neighbors of a vertex."""
         # more efficient specialization
@@ -515,7 +515,7 @@ def edges_with_weights(self) -> Iterator[tuple[tuple[Vertex, Vertex], Weight]]:
         """Iterate over all edges and their weights."""
         return zip(self.edges, self.edge_weights, strict=True)
 
-    @cache
+    @cache # noqa: B019
     def weight(self, edge: Edge | tuple[Vertex, Vertex]) -> Weight:
         """Returns the weight of an edge.
 

algobattle/types.py

@@ -39,9 +39,7 @@ Repository = "https://github.com/Benezivas/algobattle"
 
 [project.optional-dependencies]
 dev = [
-    "black>=23.12.1",
-    "flake8>=6.1.0",
-    "flake8-docstrings>=1.7.0",
+    "ruff>=0.13.2",
     "mkdocs>=1.5.3",
     "mkdocs-material>=9.5.3",
     "pymdown-extensions>=10.7",
@@ -55,7 +53,7 @@ algobattle = "algobattle.cli:app"
 [tool.ruff]
 preview = true
 line-length = 120
-exclude = ["docs"]
+exclude = ["docs/src"]
 
 [tool.ruff.lint]
 select = [
@@ -104,7 +102,7 @@ split-on-trailing-comma = false
 combine-as-imports = true
 
 [tool.pyright]
-exclude = ["docs"]
+exclude = [".venv", "docs"]
 typeCheckingMode = "standard"
 disableBytesTypePromotions = true
 strictDictionaryInference = true

pyproject.toml

@@ -1,7 +1,8 @@
 """Problem class built for tests."""
 
 from typing import Any
-from algobattle.problem import Problem, InstanceModel, SolutionModel
+
+from algobattle.problem import InstanceModel, Problem, SolutionModel
 from algobattle.util import Role, ValidationError