Merge pull request #1628 from SpiNNakerManchester/uncap-numpy

Uncap numpy

Author: Christian-B

setup.cfg

@@ -46,9 +46,6 @@ zip_safe = True
 include_package_data = True
 install_requires =
         SpiNNFrontEndCommon == 1!7.4.2
-        # required by SpiNNUtilities but capped due to quantities
-        # see https://github.com/python-quantities/python-quantities/issues/265
-        numpy < 2.4
         quantities
         pynn >= 0.11, != 0.12.0
         neo

spynnaker/pyNN/models/neural_projections/connectors/abstract_connector.py

@@ -475,7 +475,7 @@ def _generate_values(
                         synapse_info.post_population.positions[targets[i]],
                         expand_distances)
                     # evaluate expression at this distance
-                    eval_values[i] = _expr_context.eval(values, d=dist)
+                    eval_values[i:i+1] = _expr_context.eval(values, d=dist)
                 return eval_values
 
             d = self.__space.distances(

spynnaker/pyNN/models/neuron/connection_holder.py

@@ -67,7 +67,7 @@ class ConnectionHolder(object):
     )
 
     def __init__(
-            self, data_items_to_return: Optional[Sequence[str]], as_list: bool,
+            self, data_items_to_return: Optional[List[str]], as_list: bool,
             n_pre_atoms: int, n_post_atoms: int,
             connections: Optional[List[ConnectionsArray]] = None,
             fixed_values: Optional[List[Tuple[str, int]]] = None,

spynnaker/pyNN/utilities/neo_buffer_database.py

@@ -926,10 +926,10 @@ def __get_rewires_by_region(
             dtype="<i4").reshape([-1, self.__REWIRING_N_WORDS])
 
         record_time = (raw_data[:, 0] * sampling_interval_ms)
-        rewires_raw = raw_data[:, 1:]
+        rewires_raw = raw_data[:, 1]
         rew_length = len(rewires_raw)
         # rewires is 0 (elimination) or 1 (formation) in the first bit
-        rewires = (rewires_raw[i][0] & self.__FIRST_BIT
+        rewires = (rewires_raw[i] & self.__FIRST_BIT
                    for i in range(rew_length))
         # the post-neuron ID is stored in the next 8 bytes
         post_ids = (((int(rewires_raw[i]) >> self.__POST_ID_SHIFT) %

unittests/model_tests/neuron/test_synaptic_manager.py

@@ -214,8 +214,9 @@ def test_write_data_spec() -> None:
         assert len(connections_4) == len(from_list_list)
         list_weights = [values[2] for values in from_list_list]
         list_delays = [values[3] for values in from_list_list]
-        assert all(list_weights == connections_4["weight"])
-        assert all(list_delays == connections_4["delay"])
+        for i in range(10):
+            assert list_weights[i] == connections_4["weight"][i]
+            assert list_delays[i] == connections_4["delay"][i]
     finally:
         shutil.rmtree(report_folder, ignore_errors=True)