Merge pull request #131 from ImogenBits/typings

Add Ellipsis type annotation
Algorithmic-Battle · Oct 5, 2023 · dc069a0 · dc069a0
2 parents 867a337 + 3f6e14a
commit dc069a0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/algobattle/battle.py b/algobattle/battle.py
@@ -9,6 +9,7 @@
 from abc import abstractmethod
 from inspect import isclass
 from itertools import count
+from types import EllipsisType
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -118,12 +119,12 @@ async def run(
         self,
         max_size: int,
         *,
-        timeout_generator: float | None = ...,
-        space_generator: int | None = ...,
-        cpus_generator: int = ...,
-        timeout_solver: float | None = ...,
-        space_solver: int | None = ...,
-        cpus_solver: int = ...,
+        timeout_generator: float | None | EllipsisType = ...,
+        space_generator: int | None | EllipsisType = ...,
+        cpus_generator: int | EllipsisType = ...,
+        timeout_solver: float | None | EllipsisType = ...,
+        space_solver: int | None | EllipsisType = ...,
+        cpus_solver: int | EllipsisType = ...,
         generator_battle_input: Encodable | None = None,
         solver_battle_input: Encodable | None = None,
         generator_battle_output: type[Encodable] | None = None,

diff --git a/tests/test_battles.py b/tests/test_battles.py
@@ -1,6 +1,7 @@
 """Tests for the Battle types."""
 from enum import Enum
 from itertools import chain, cycle
+from types import EllipsisType
 from typing import Iterable, TypeVar
 from unittest import IsolatedAsyncioTestCase, main
 
@@ -51,12 +52,12 @@ async def run(
         self,
         max_size: int,
         *,
-        timeout_generator: float | None = ...,
-        space_generator: int | None = ...,
-        cpus_generator: int = ...,
-        timeout_solver: float | None = ...,
-        space_solver: int | None = ...,
-        cpus_solver: int = ...,
+        timeout_generator: float | None | EllipsisType = ...,
+        space_generator: int | None | EllipsisType = ...,
+        cpus_generator: int | EllipsisType = ...,
+        timeout_solver: float | None | EllipsisType = ...,
+        space_solver: int | None | EllipsisType = ...,
+        cpus_solver: int | EllipsisType = ...,
         generator_battle_input: Encodable | None = None,
         solver_battle_input: Encodable | None = None,
         generator_battle_output: type[Encodable] | None = None,
@@ -95,12 +96,12 @@ async def run(
         self,
         max_size: int,
         *,
-        timeout_generator: float | None = ...,
-        space_generator: int | None = ...,
-        cpus_generator: int = ...,
-        timeout_solver: float | None = ...,
-        space_solver: int | None = ...,
-        cpus_solver: int = ...,
+        timeout_generator: float | None | EllipsisType = ...,
+        space_generator: int | None | EllipsisType = ...,
+        cpus_generator: int | EllipsisType = ...,
+        timeout_solver: float | None | EllipsisType = ...,
+        space_solver: int | None | EllipsisType = ...,
+        cpus_solver: int | EllipsisType = ...,
         generator_battle_input: Encodable | None = None,
         solver_battle_input: Encodable | None = None,
         generator_battle_output: type[Encodable] | None = None,