Merge branch 'master' into clone_connectors

Author: Christian-B

spynnaker/pyNN/models/neuron/synapse_io.py

@@ -385,7 +385,8 @@ def _get_row_data(
 def convert_to_connections(
         synapse_info: SynapseInformation, post_vertex_slice: Slice,
         n_pre_atoms: int, max_row_length: int, n_synapse_types: int,
-        weight_scales: WeightScales, data: Union[bytes, NDArray, None],
+        weight_scales: WeightScales,
+        data: bytearray | bytes | memoryview | NDArray | None,
         delayed: bool, post_vertex_max_delay_ticks: int,
         max_atoms_per_core: int) -> ConnectionsArray:
     """

spynnaker/pyNN/models/neuron/synaptic_matrix_app.py

@@ -405,6 +405,7 @@ def get_connections(self, placement: Placement) -> List[NDArray]:
         splitter = self.__app_edge.post_vertex.splitter
         vertex_slice = placement.vertex.vertex_slice
         if self.__syn_mat_offset is not None:
+            block: bytearray | bytes | memoryview
             if self.__download_index is not None:
                 assert buffers is not None
                 block, _ = buffers.get_download(
@@ -436,7 +437,7 @@ def get_connections(self, placement: Placement) -> List[NDArray]:
         return connections
 
     def __get_block(
-            self, placement: Placement, synapses_address: int) -> bytes:
+            self, placement: Placement, synapses_address: int) -> bytearray:
         """
         Get a block of data for undelayed synapses.
 
@@ -451,7 +452,7 @@ def __get_block(
             placement.x, placement.y, address, self.__matrix_size)
 
     def __get_delayed_block(
-            self, placement: Placement, synapses_address: int) -> bytes:
+            self, placement: Placement, synapses_address: int) -> bytearray:
         """
         Get a block of data for delayed synapses.
 

spynnaker/pyNN/utilities/struct.py

@@ -332,7 +332,8 @@ def is_generatable(self) -> bool:
                    for data_type, _name in self.__fields)
 
     def read_data(
-            self, data: bytes, values: RangeDictionary, data_offset: int = 0,
+            self, data: bytearray | bytes, values: RangeDictionary,
+            data_offset: int = 0,
             vertex_slice: Optional[Slice] = None) -> None:
         """
         Read a byte string of data and write to values.

unittests/model_tests/neuron/test_synaptic_manager.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 import shutil
 import struct
-from typing import Any, BinaryIO, List, Optional, Sequence, Tuple, Union
+from typing import Any, BinaryIO, List, Optional, Sequence, Tuple
 import unittest
 from tempfile import mkdtemp
 import numpy
@@ -71,7 +71,7 @@ def malloc_sdram(
     @overrides(MockableTransceiver.write_memory)
     def write_memory(
             self, x: int, y: int, base_address: int,
-            data: Union[BinaryIO, bytes, int, str], *,
+            data: BinaryIO | bytearray | bytes | int | str, *,
             n_bytes: Optional[int] = None, offset: int = 0, cpu: int = 0,
             get_sum: bool = False) -> Tuple[int, int]:
         if data is None: