Merge branch 'master' into dead_code

Author: Christian-B

spynnaker/pyNN/models/neuron/abstract_pynn_neuron_model.py

@@ -106,8 +106,7 @@ def __init__(self, model: AbstractNeuronImpl):
     def _model(self) -> AbstractNeuronImpl:
         return self.__model
 
-    @overrides(AbstractPyNNModel.create_vertex,
-               additional_arguments=_population_parameters.keys())
+    @overrides(AbstractPyNNModel.create_vertex)
     def create_vertex(
             self, n_neurons: int, label: str, *,
             spikes_per_second: Optional[float] = None,

spynnaker/pyNN/models/neuron/abstract_pynn_neuron_model_standard.py

@@ -68,8 +68,7 @@ def __init__(
             model_name, binary, neuron_model, input_type, synapse_type,
             threshold_type, additional_input_type))
 
-    @overrides(AbstractPyNNNeuronModel.create_vertex,  # type: ignore[has-type]
-               additional_arguments={"n_steps_per_timestep"})
+    @overrides(AbstractPyNNNeuronModel.create_vertex)  # type: ignore[has-type]
     def create_vertex(
             self, n_neurons: int, label: str, *,
             spikes_per_second: Optional[float] = None,

spynnaker/pyNN/models/spike_source/spike_source_array.py

@@ -32,8 +32,7 @@ def __init__(self, spike_times: Optional[Spikes] = None):
             spike_times = []
         self.__spike_times = spike_times
 
-    @overrides(AbstractPyNNModel.create_vertex,
-               additional_arguments=default_population_parameters.keys())
+    @overrides(AbstractPyNNModel.create_vertex)
     def create_vertex(
             self, n_neurons: int, label: str, *,
             splitter: Optional[AbstractSplitterCommon] = None,

spynnaker/pyNN/models/spike_source/spike_source_poisson.py

@@ -49,8 +49,7 @@ def absolute_max_atoms_per_core(  # pylint: disable=no-self-argument
             cls) -> int:
         return DEFAULT_MAX_ATOMS_PER_CORE
 
-    @overrides(AbstractPyNNModel.create_vertex,
-               additional_arguments=default_population_parameters.keys())
+    @overrides(AbstractPyNNModel.create_vertex)
     def create_vertex(
             self, n_neurons: int, label: str, *,
             seed: Optional[int] = None, max_rate: Optional[float] = None,

spynnaker/pyNN/models/spike_source/spike_source_poisson_variable.py

@@ -51,8 +51,7 @@ def absolute_max_atoms_per_core(  # pylint: disable=no-self-argument
             cls) -> int:
         return DEFAULT_MAX_ATOMS_PER_CORE
 
-    @overrides(AbstractPyNNModel.create_vertex,
-               additional_arguments=default_population_parameters.keys())
+    @overrides(AbstractPyNNModel.create_vertex)
     def create_vertex(
             self, n_neurons: int, label: str, *, seed: Optional[int] = None,
             splitter: Optional[AbstractSplitterCommon] = None

spynnaker/pyNN/models/utility_models/spike_injector/spike_injector.py

@@ -34,8 +34,7 @@ class SpikeInjector(AbstractPyNNModel):
 
     default_population_parameters = _population_parameters
 
-    @overrides(AbstractPyNNModel.create_vertex,
-               additional_arguments=_population_parameters.keys())
+    @overrides(AbstractPyNNModel.create_vertex)
     def create_vertex(
             self, n_neurons: int, label: str, *,
             port: Optional[int] = None, virtual_key: Optional[int] = None,

spynnaker/pyNN/utilities/data_population.py

@@ -78,7 +78,7 @@ def write_data(self, io: Union[str, neo.baseio.BaseIO],
         # write the neo block to the file
         io.write(bl=data)
 
-    @overrides(Population.describe, adds_typing=True)
+    @overrides(Population.describe)
     def describe(self, template: Optional[str] = None,
                  engine: Optional[Union[str, TemplateEngine]] = None
                  ) -> Union[str, Dict[str, Any]]: