Merge branch 'master' into eprop_adaptive_update

SpiNNakerManchester · Aug 8, 2023 · a3b2ba8 · a3b2ba8
2 parents ddb0630 + c3319b0
commit a3b2ba8
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 17 deletions.
diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml
@@ -49,7 +49,7 @@ jobs:
       uses: ./support/actions/install-spinn-deps
       with:
         repositories: >
-          SpiNNUtils SpiNNMachine SpiNNMan PACMAN DataSpecification spalloc
+          SpiNNUtils SpiNNMachine SpiNNMan PACMAN spalloc
           SpiNNFrontEndCommon sPyNNaker TestBase
         install: true
 

diff --git a/.ratexcludes b/.ratexcludes
@@ -12,7 +12,6 @@
 **/*.npy
 **/*.jpg
 **/*.elf
-**/DataSpecification/**
 **/IntroLab/**
 **/PACMAN/**
 **/PyNN8Examples/**

diff --git a/pypi_to_import b/pypi_to_import
@@ -2,7 +2,6 @@ SpiNNUtilities:spinn_utilities
 SpiNNMachine:spinn_machine
 SpiNNMan:spinnman
 SpiNNaker_PACMAN:pacman
-SpiNNaker_DataSpecification:data_specification
 SpiNNFrontEndCommon:spinn_front_end_common
 sPyNNaker:spynnaker
 SpyNNaker8:spynnaker8
diff --git a/python_models8/_version.py b/python_models8/_version.py
@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1!6.0.1"
-__version_month__ = "May"
-__version_year__ = "2021"
+__version__ = "1!7.1.0"
+__version_month__ = "TBD"
+__version_year__ = "TBD"
 __version_day__ = "TBD"
 __version_name__ = "Not yet released"
diff --git a/python_models8/neuron/additional_inputs/my_additional_input.py b/python_models8/neuron/additional_inputs/my_additional_input.py
@@ -1,4 +1,4 @@
-from data_specification.enums import DataType
+from spinn_front_end_common.interface.ds import DataType
 from spynnaker.pyNN.models.neuron.additional_inputs import (
     AbstractAdditionalInput)
 from spynnaker.pyNN.utilities.struct import Struct

diff --git a/python_models8/neuron/implementations/my_full_neuron_impl.py b/python_models8/neuron/implementations/my_full_neuron_impl.py
@@ -1,4 +1,4 @@
-from data_specification.enums.data_type import DataType
+from spinn_front_end_common.interface.ds import DataType
 from spynnaker.pyNN.utilities.struct import Struct
 from spynnaker.pyNN.models.neuron.implementations import (
     AbstractNeuronImpl)

diff --git a/python_models8/neuron/input_types/my_input_type.py b/python_models8/neuron/input_types/my_input_type.py
@@ -1,5 +1,5 @@
 from spynnaker.pyNN.models.neuron.input_types import AbstractInputType
-from data_specification.enums.data_type import DataType
+from spinn_front_end_common.interface.ds import DataType
 from spynnaker.pyNN.utilities.struct import Struct
 
 # TODO create constants to match the parameter names

diff --git a/python_models8/neuron/input_types/my_input_type_semd.py b/python_models8/neuron/input_types/my_input_type_semd.py
@@ -1,5 +1,5 @@
 from spinn_utilities.overrides import overrides
-from data_specification.enums import DataType
+from spinn_front_end_common.interface.ds import DataType
 from spynnaker.pyNN.models.neuron.input_types import AbstractInputType
 from spynnaker.pyNN.utilities.struct import Struct
 

diff --git a/python_models8/neuron/neuron_models/my_neuron_model.py b/python_models8/neuron/neuron_models/my_neuron_model.py
@@ -1,5 +1,5 @@
 from spinn_utilities.overrides import overrides
-from data_specification.enums import DataType
+from spinn_front_end_common.interface.ds import DataType
 from spynnaker.pyNN.models.neuron.implementations import (
     AbstractStandardNeuronComponent)
 from spynnaker.pyNN.utilities.struct import Struct

diff --git a/python_models8/neuron/plasticity/stdp/timing_dependence/my_timing_dependence.py b/python_models8/neuron/plasticity/stdp/timing_dependence/my_timing_dependence.py
@@ -1,5 +1,5 @@
 from spinn_utilities.overrides import overrides
-from data_specification.enums import DataType
+from spinn_front_end_common.interface.ds import DataType
 from spinn_front_end_common.utilities.constants import BYTES_PER_WORD
 from spynnaker.pyNN.models.neuron.plasticity.stdp.timing_dependence import (
     AbstractTimingDependence)

diff --git a/python_models8/neuron/plasticity/stdp/weight_dependence/my_weight_dependence.py b/python_models8/neuron/plasticity/stdp/weight_dependence/my_weight_dependence.py
@@ -1,5 +1,5 @@
 from spinn_utilities.overrides import overrides
-from data_specification.enums import DataType
+from spinn_front_end_common.interface.ds import DataType
 from spinn_front_end_common.utilities.constants import BYTES_PER_WORD
 from spynnaker.pyNN.models.neuron.plasticity.stdp.weight_dependence import (
     AbstractWeightDependence, AbstractHasAPlusAMinus)

diff --git a/python_models8/neuron/synapse_types/my_synapse_type.py b/python_models8/neuron/synapse_types/my_synapse_type.py
@@ -1,5 +1,5 @@
 from spinn_utilities.overrides import overrides
-from data_specification.enums import DataType
+from spinn_front_end_common.interface.ds import DataType
 from spynnaker.pyNN.models.neuron.synapse_types import AbstractSynapseType
 from spynnaker.pyNN.utilities.struct import Struct
 from spynnaker.pyNN.data.spynnaker_data_view import SpynnakerDataView

diff --git a/python_models8/neuron/threshold_types/my_threshold_type.py b/python_models8/neuron/threshold_types/my_threshold_type.py
@@ -1,4 +1,4 @@
-from data_specification.enums import DataType
+from spinn_front_end_common.interface.ds import DataType
 from spynnaker.pyNN.models.neuron.threshold_types import AbstractThresholdType
 from spynnaker.pyNN.utilities.struct import Struct
 

diff --git a/setup.cfg b/setup.cfg
@@ -47,7 +47,7 @@ packages = find:
 zip_safe = True
 include_package_data = True
 install_requires =
-        sPyNNaker == 1!6.0.1
+        sPyNNaker == 1!7.1.0
 
 [options.packages.find]
 include =
@@ -62,7 +62,7 @@ include =
 
 [options.extras_require]
 test =
-        SpiNNakerTestBase == 1!6.0.1
+        SpiNNakerTestBase == 1!7.1.0
         # pytest will be brought in by pytest-cov
         pytest-cov
         testfixtures