change typing declarations to be identical in overrides

pacman/model/graphs/abstract_edge.py

@@ -39,7 +39,7 @@ def label(self) -> Optional[str]:
 
     @property
     @abstractmethod
-    def pre_vertex(self) -> V:
+    def pre_vertex(self) -> AbstractVertex:
         """
         The vertex at the start of the edge.
 
@@ -49,7 +49,7 @@ def pre_vertex(self) -> V:
 
     @property
     @abstractmethod
-    def post_vertex(self) -> V:
+    def post_vertex(self) -> AbstractVertex:
         """
         The vertex at the end of the edge.
 

pacman/model/graphs/abstract_edge_partition.py

@@ -52,7 +52,7 @@ def __init__(self, identifier: str,
         self._allowed_edge_types = allowed_edge_types
         self._edges: OrderedSet[E] = OrderedSet()
 
-    def add_edge(self, edge: E):
+    def add_edge(self, edge: AbstractEdge):
         """
         Add an edge to the edge partition.
 

pacman/model/graphs/abstract_multiple_partition.py

@@ -19,10 +19,9 @@
 from pacman.exceptions import PacmanConfigurationException, PacmanValueError
 from pacman.model.graphs import (
     AbstractVertex, AbstractEdge, AbstractEdgePartition)
+from pacman.model.graphs.abstract_edge_partition import E
 #: :meta private:
 V = TypeVar("V", bound=AbstractVertex)
-#: :meta private:
-E = TypeVar("E", bound=AbstractEdge)
 
 
 class AbstractMultiplePartition(AbstractEdgePartition[E], Generic[V, E]):
@@ -53,7 +52,7 @@ def __init__(
                 "There were clones in your list of acceptable pre vertices")
 
     @overrides(AbstractEdgePartition.add_edge)
-    def add_edge(self, edge: E):
+    def add_edge(self, edge: AbstractEdge):
         # safety checks
         if edge.pre_vertex not in self._pre_vertices.keys():
             raise PacmanValueError(
@@ -67,5 +66,5 @@ def add_edge(self, edge: E):
 
     @property
     @overrides(AbstractEdgePartition.pre_vertices)
-    def pre_vertices(self) -> Collection[V]:
+    def pre_vertices(self) -> Collection[AbstractVertex]:
         return self._pre_vertices.keys()

pacman/model/graphs/abstract_single_source_partition.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 from __future__ import annotations
 from typing import (
-    Generic, Sequence, Tuple, Type, TypeVar, Union, TYPE_CHECKING)
+    Collection, Generic, Tuple, Type, TypeVar, Union, TYPE_CHECKING)
 from spinn_utilities.abstract_base import AbstractBase
 from spinn_utilities.overrides import overrides
 from pacman.exceptions import PacmanConfigurationException
@@ -44,7 +44,7 @@ def __init__(
         self._pre_vertex = pre_vertex
 
     @overrides(AbstractEdgePartition.add_edge)
-    def add_edge(self, edge: E):
+    def add_edge(self, edge: AbstractEdge):
         super().add_edge(edge)
         if edge.pre_vertex != self._pre_vertex:
             raise PacmanConfigurationException(
@@ -61,5 +61,5 @@ def pre_vertex(self) -> V:
 
     @property
     @overrides(AbstractEdgePartition.pre_vertices)
-    def pre_vertices(self) -> Sequence[V]:
+    def pre_vertices(self) -> Collection[AbstractVertex]:
         return (self.pre_vertex, )

pacman/model/graphs/application/abstract/abstract_one_app_one_machine_vertex.py

@@ -40,7 +40,7 @@ def __init__(self, machine_vertex: V, label: Optional[str],
         super().remember_machine_vertex(machine_vertex)
 
     @overrides(ApplicationVertex.remember_machine_vertex)
-    def remember_machine_vertex(self, machine_vertex: V):
+    def remember_machine_vertex(self, machine_vertex: MachineVertex):
         assert (machine_vertex == self._machine_vertex)
 
     @property

pacman/model/graphs/application/application_vertex.py

@@ -134,7 +134,7 @@ def splitter(self, new_value: AbstractSplitterCommon[Self]):
         self._splitter = new_value
         self._splitter.set_governed_app_vertex(self)
 
-    def remember_machine_vertex(self, machine_vertex: MV):
+    def remember_machine_vertex(self, machine_vertex: MachineVertex):
         """
         Adds the machine vertex to the iterable returned by machine_vertices
 

pacman/model/graphs/common/mdslice.py

@@ -132,7 +132,7 @@ def __hash__(self) -> int:
 
     @classmethod
     @overrides(Slice.from_string, extend_doc=False)
-    def from_string(cls, as_str: str) -> Union[MDSlice, Slice]:
+    def from_string(cls, as_str: str) -> Slice:
         """
         Convert the string form of a :py:class:`MDSlice` into an object
         instance.

pacman/model/graphs/machine/machine_edge.py

@@ -51,7 +51,7 @@ def __init__(self, pre_vertex: MachineVertex, post_vertex: MachineVertex,
 
     @property
     @overrides(AbstractEdge.label)
-    def label(self):
+    def label(self) -> Optional[str]:
         return self._label
 
     @property

pacman/model/resources/constant_sdram.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from typing import Optional
 from spinn_utilities.overrides import overrides
 from .abstract_sdram import AbstractSDRAM
 
@@ -35,7 +36,7 @@ def __init__(self, sdram: int):
         self._sdram = int(sdram)
 
     @overrides(AbstractSDRAM.get_total_sdram)
-    def get_total_sdram(self, n_timesteps) -> int:  # @UnusedVariable
+    def get_total_sdram(self, n_timesteps: Optional[int]) -> int:  # @UnusedVariable
         return self._sdram
 
     @property