Merge branch 'master' into ExternalCochleaDevice

Author: Christian-B

.github/workflows/python_actions.yml

@@ -32,6 +32,6 @@ jobs:
       coverage-package: spynnaker
       flake8-packages: spynnaker unittests spynnaker_integration_tests proxy_integration_tests
       pylint-packages: spynnaker
-      mypy-packages: proxy_integration_tests
-      mypy-full-packages: spynnaker unittests spynnaker_integration_tests
+      mypy-packages:
+      mypy-full-packages: spynnaker unittests spynnaker_integration_tests proxy_integration_tests
       cfg-file: spynnaker

mypy.bash

@@ -27,4 +27,4 @@ spalloc="../spalloc/spalloc_client"
 fec="../SpiNNFrontEndCommon/spinn_front_end_common"
 test_base="../TestBase/spinnaker_testbase"
 
-mypy --python-version 3.8 $utils $machine $man $pacman $spalloc $fec $test_base spynnaker unittests spynnaker_integration_tests
+mypy --python-version 3.8 $utils $machine $man $pacman $spalloc $fec $test_base spynnaker unittests spynnaker_integration_tests proxy_integration_tests

mypyd.bash

@@ -27,5 +27,5 @@ spalloc="../spalloc/spalloc_client"
 fec="../SpiNNFrontEndCommon/spinn_front_end_common"
 test_base="../TestBase/spinnaker_testbase"
 
-mypy --python-version 3.8 --disallow-untyped-defs $utils $machine $man $pacman $spalloc $fec $test_base spynnaker unittests spynnaker_integration_tests
+mypy --python-version 3.8 --disallow-untyped-defs $utils $machine $man $pacman $spalloc $fec $test_base spynnaker unittests spynnaker_integration_tests proxy_integration_tests
 

proxy_integration_tests/test_python_debug/check_debug.py

@@ -29,7 +29,7 @@ class CheckDebug(BaseTestCase):
     that it does not crash in debug mode. All reports on.
     """
 
-    def assert_reports(self):
+    def assert_reports(self) -> None:
         skipped = cfg_paths_skipped()
         for section in config_sections():
             for option in config_options(section):
@@ -46,7 +46,7 @@ def assert_reports(self):
                     raise AssertionError(
                         f"Unable to find report for {option} {path}")
 
-    def debug(self):
+    def debug(self) -> None:
         sim.setup(1.0)
         pop = sim.Population(100, sim.IF_curr_exp, {}, label="pop")
         pop.record("v")

proxy_integration_tests/test_python_debug/test_debug.py

@@ -17,5 +17,5 @@
 
 class TestDebug(CheckDebug):
 
-    def test_debug(self):
+    def test_debug(self) -> None:
         self.runsafe(self.debug)

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