From f0c6a564407f50aba78c52d01eb874bfb7a3fbc8 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Tue, 20 Jun 2023 13:44:57 +0100 Subject: [PATCH 1/4] Move DataType --- python_models8/neuron/additional_inputs/my_additional_input.py | 2 +- python_models8/neuron/implementations/my_full_neuron_impl.py | 2 +- python_models8/neuron/input_types/my_input_type.py | 2 +- python_models8/neuron/input_types/my_input_type_semd.py | 2 +- python_models8/neuron/neuron_models/my_neuron_model.py | 2 +- .../plasticity/stdp/timing_dependence/my_timing_dependence.py | 2 +- .../plasticity/stdp/weight_dependence/my_weight_dependence.py | 2 +- python_models8/neuron/synapse_types/my_synapse_type.py | 2 +- python_models8/neuron/threshold_types/my_threshold_type.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/python_models8/neuron/additional_inputs/my_additional_input.py b/python_models8/neuron/additional_inputs/my_additional_input.py index 9f077f7..9e1eae2 100644 --- 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 index be0ebd5..673b6d8 100644 --- 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 index 58e01f5..a6bece4 100644 --- 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 index 3e02a9c..c09efbd 100644 --- 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 index 687d829..80c7fb8 100644 --- 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 index 1834d0c..122f012 100644 --- 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 index 099707a..723075d 100644 --- 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 index b0d1a9a..cbc142e 100644 --- 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 index a4a169b..86bb746 100644 --- 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 From 37fbb2fef7c117d19fb15e41d7f2be574d59e367 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Tue, 20 Jun 2023 14:00:53 +0100 Subject: [PATCH 2/4] remove links to DataSpecifation reporitory --- .github/workflows/python_actions.yml | 2 +- .ratexcludes | 1 - pypi_to_import | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml index 52e851c..aa15fc8 100644 --- 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 index 011dece..7256fc1 100644 --- 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 index 5224aec..6b10c7e 100644 --- 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 From 57c30e3e8fa40680eae76d93e4971c560675b047 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 20 Jul 2023 13:37:16 +0100 Subject: [PATCH 3/4] info for release 7.1.0 --- setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 168c59e..d418262 100644 --- 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 From 447c79539158214724f31484578edd63d68696e4 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 20 Jul 2023 13:37:17 +0100 Subject: [PATCH 4/4] info for release 7.1.0 --- python_models8/_version.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python_models8/_version.py b/python_models8/_version.py index 54e334e..6288012 100644 --- 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"