From d0e3b5620fcc2f5cc9c7f9d7c50bfe164a5b81f9 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Fri, 16 May 2025 08:04:46 +0100 Subject: [PATCH 1/4] adds_typing not needed --- spynnaker/pyNN/utilities/data_population.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spynnaker/pyNN/utilities/data_population.py b/spynnaker/pyNN/utilities/data_population.py index 41c56fc343c..5a377ae7c8e 100644 --- a/spynnaker/pyNN/utilities/data_population.py +++ b/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]]: From f629c6d8d09f57b849980704e3f47c6bb4bea04d Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Fri, 16 May 2025 13:40:49 +0100 Subject: [PATCH 2/4] remove stuff pylint does from overrides --- spynnaker/pyNN/models/neuron/abstract_pynn_neuron_model.py | 3 +-- .../pyNN/models/neuron/abstract_pynn_neuron_model_standard.py | 3 +-- spynnaker/pyNN/models/spike_source/spike_source_array.py | 3 +-- spynnaker/pyNN/models/spike_source/spike_source_poisson.py | 3 +-- .../pyNN/models/spike_source/spike_source_poisson_variable.py | 3 +-- .../models/utility_models/spike_injector/spike_injector.py | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/spynnaker/pyNN/models/neuron/abstract_pynn_neuron_model.py b/spynnaker/pyNN/models/neuron/abstract_pynn_neuron_model.py index 5588a3fc659..a9a337e36d7 100644 --- a/spynnaker/pyNN/models/neuron/abstract_pynn_neuron_model.py +++ 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, diff --git a/spynnaker/pyNN/models/neuron/abstract_pynn_neuron_model_standard.py b/spynnaker/pyNN/models/neuron/abstract_pynn_neuron_model_standard.py index 8b53e1f4a71..7a2515eb254 100644 --- a/spynnaker/pyNN/models/neuron/abstract_pynn_neuron_model_standard.py +++ b/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) def create_vertex( self, n_neurons: int, label: str, *, spikes_per_second: Optional[float] = None, diff --git a/spynnaker/pyNN/models/spike_source/spike_source_array.py b/spynnaker/pyNN/models/spike_source/spike_source_array.py index 355bd3fca99..9808dea3dcb 100644 --- a/spynnaker/pyNN/models/spike_source/spike_source_array.py +++ b/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, diff --git a/spynnaker/pyNN/models/spike_source/spike_source_poisson.py b/spynnaker/pyNN/models/spike_source/spike_source_poisson.py index a6521e5cbb2..b12f68103ed 100644 --- a/spynnaker/pyNN/models/spike_source/spike_source_poisson.py +++ b/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, diff --git a/spynnaker/pyNN/models/spike_source/spike_source_poisson_variable.py b/spynnaker/pyNN/models/spike_source/spike_source_poisson_variable.py index cc6ce6adb53..1795ed8d764 100644 --- a/spynnaker/pyNN/models/spike_source/spike_source_poisson_variable.py +++ b/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 diff --git a/spynnaker/pyNN/models/utility_models/spike_injector/spike_injector.py b/spynnaker/pyNN/models/utility_models/spike_injector/spike_injector.py index bf79a5ad14d..c05655e74c4 100644 --- a/spynnaker/pyNN/models/utility_models/spike_injector/spike_injector.py +++ b/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, From e034902516dfa63bd2c7d6e3e04f937ac1063285 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Fri, 16 May 2025 15:50:50 +0100 Subject: [PATCH 3/4] # type: ignore[has-type] --- spynnaker/pyNN/models/neuron/abstract_pynn_neuron_model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spynnaker/pyNN/models/neuron/abstract_pynn_neuron_model.py b/spynnaker/pyNN/models/neuron/abstract_pynn_neuron_model.py index a9a337e36d7..a8999fec751 100644 --- a/spynnaker/pyNN/models/neuron/abstract_pynn_neuron_model.py +++ b/spynnaker/pyNN/models/neuron/abstract_pynn_neuron_model.py @@ -106,7 +106,7 @@ def __init__(self, model: AbstractNeuronImpl): def _model(self) -> AbstractNeuronImpl: return self.__model - @overrides(AbstractPyNNModel.create_vertex) + @overrides(AbstractPyNNModel.create_vertex) # type: ignore[has-type] def create_vertex( self, n_neurons: int, label: str, *, spikes_per_second: Optional[float] = None, From 6f5e3919d57ad1951b771b073cfa9310c0c587ad Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Fri, 16 May 2025 16:02:18 +0100 Subject: [PATCH 4/4] correct # type: ignore[has-type] --- spynnaker/pyNN/models/neuron/abstract_pynn_neuron_model.py | 2 +- .../pyNN/models/neuron/abstract_pynn_neuron_model_standard.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spynnaker/pyNN/models/neuron/abstract_pynn_neuron_model.py b/spynnaker/pyNN/models/neuron/abstract_pynn_neuron_model.py index a8999fec751..a9a337e36d7 100644 --- a/spynnaker/pyNN/models/neuron/abstract_pynn_neuron_model.py +++ b/spynnaker/pyNN/models/neuron/abstract_pynn_neuron_model.py @@ -106,7 +106,7 @@ def __init__(self, model: AbstractNeuronImpl): def _model(self) -> AbstractNeuronImpl: return self.__model - @overrides(AbstractPyNNModel.create_vertex) # type: ignore[has-type] + @overrides(AbstractPyNNModel.create_vertex) def create_vertex( self, n_neurons: int, label: str, *, spikes_per_second: Optional[float] = None, diff --git a/spynnaker/pyNN/models/neuron/abstract_pynn_neuron_model_standard.py b/spynnaker/pyNN/models/neuron/abstract_pynn_neuron_model_standard.py index 7a2515eb254..9e58e6e7e45 100644 --- a/spynnaker/pyNN/models/neuron/abstract_pynn_neuron_model_standard.py +++ b/spynnaker/pyNN/models/neuron/abstract_pynn_neuron_model_standard.py @@ -68,7 +68,7 @@ def __init__( model_name, binary, neuron_model, input_type, synapse_type, threshold_type, additional_input_type)) - @overrides(AbstractPyNNNeuronModel.create_vertex) + @overrides(AbstractPyNNNeuronModel.create_vertex) # type: ignore[has-type] def create_vertex( self, n_neurons: int, label: str, *, spikes_per_second: Optional[float] = None,