From f4d137256b43cbfd8e238ed5f5af78f6a91f2471 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Tue, 10 Feb 2026 12:58:22 +0000 Subject: [PATCH] remove the 8 --- .github/workflows/python_actions.yml | 2 +- .ratexcludes | 2 +- c_models/Makefile | 2 +- c_models/makefiles/extra.mk | 2 +- c_models/makefiles/extra_neuron.mk | 2 +- c_models/makefiles/extra_synapse.mk | 2 +- doc/source/conf.py | 2 +- doc/source/modules.rst | 4 ++-- examples/my_example.py | 18 +++++++++--------- examples/my_sEMD_example.py | 2 +- nmt_integration_tests/test_my_full_neuron.py | 2 +- .../test_my_if_curr_exp_semd.py | 2 +- .../test_my_model_curr_exp.py | 2 +- .../test_my_model_curr_exp_my_input_type.py | 2 +- .../test_my_model_curr_exp_my_threshold.py | 2 +- .../test_my_model_curr_exp_stdp.py | 6 +++--- .../test_my_model_curr_my_additional_input.py | 2 +- .../test_my_model_curr_my_synapse_type.py | 2 +- {python_models8 => python_models}/__init__.py | 2 +- {python_models8 => python_models}/_version.py | 0 .../connectors/__init__.py | 0 .../connectors/my_connector.py | 0 .../model_binaries/.gitignore | 0 .../model_binaries/__init__.py | 0 .../neuron/__init__.py | 0 .../neuron/additional_inputs/__init__.py | 0 .../additional_inputs/my_additional_input.py | 0 .../neuron/builds/__init__.py | 0 .../neuron/builds/my_full_neuron.py | 2 +- .../neuron/builds/my_if_curr_exp_sEMD.py | 2 +- .../neuron/builds/my_model_curr_exp.py | 2 +- .../my_model_curr_exp_my_additional_input.py | 4 ++-- .../builds/my_model_curr_exp_my_input_type.py | 4 ++-- .../builds/my_model_curr_exp_my_threshold.py | 4 ++-- .../builds/my_model_curr_my_synapse_type.py | 4 ++-- .../neuron/implementations/__init__.py | 0 .../implementations/my_full_neuron_impl.py | 0 .../neuron/input_types/__init__.py | 0 .../neuron/input_types/my_input_type.py | 0 .../neuron/input_types/my_input_type_semd.py | 0 .../neuron/neuron_models/__init__.py | 0 .../neuron/neuron_models/my_neuron_model.py | 0 .../neuron/plasticity/__init__.py | 0 .../neuron/plasticity/stdp/__init__.py | 0 .../stdp/timing_dependence/__init__.py | 0 .../timing_dependence/my_timing_dependence.py | 0 .../stdp/weight_dependence/__init__.py | 0 .../weight_dependence/my_weight_dependence.py | 0 .../neuron/synapse_types/__init__.py | 0 .../neuron/synapse_types/my_synapse_type.py | 0 .../neuron/threshold_types/__init__.py | 0 .../threshold_types/my_threshold_type.py | 0 {python_models8 => python_models}/py.typed | 0 setup.cfg | 6 +++--- unittests/test_import_all.py | 4 ++-- 55 files changed, 46 insertions(+), 46 deletions(-) rename {python_models8 => python_models}/__init__.py (84%) rename {python_models8 => python_models}/_version.py (100%) rename {python_models8 => python_models}/connectors/__init__.py (100%) rename {python_models8 => python_models}/connectors/my_connector.py (100%) rename {python_models8 => python_models}/model_binaries/.gitignore (100%) rename {python_models8 => python_models}/model_binaries/__init__.py (100%) rename {python_models8 => python_models}/neuron/__init__.py (100%) rename {python_models8 => python_models}/neuron/additional_inputs/__init__.py (100%) rename {python_models8 => python_models}/neuron/additional_inputs/my_additional_input.py (100%) rename {python_models8 => python_models}/neuron/builds/__init__.py (100%) rename {python_models8 => python_models}/neuron/builds/my_full_neuron.py (84%) rename {python_models8 => python_models}/neuron/builds/my_if_curr_exp_sEMD.py (97%) rename {python_models8 => python_models}/neuron/builds/my_model_curr_exp.py (96%) rename {python_models8 => python_models}/neuron/builds/my_model_curr_exp_my_additional_input.py (93%) rename {python_models8 => python_models}/neuron/builds/my_model_curr_exp_my_input_type.py (94%) rename {python_models8 => python_models}/neuron/builds/my_model_curr_exp_my_threshold.py (92%) rename {python_models8 => python_models}/neuron/builds/my_model_curr_my_synapse_type.py (92%) rename {python_models8 => python_models}/neuron/implementations/__init__.py (100%) rename {python_models8 => python_models}/neuron/implementations/my_full_neuron_impl.py (100%) rename {python_models8 => python_models}/neuron/input_types/__init__.py (100%) rename {python_models8 => python_models}/neuron/input_types/my_input_type.py (100%) rename {python_models8 => python_models}/neuron/input_types/my_input_type_semd.py (100%) rename {python_models8 => python_models}/neuron/neuron_models/__init__.py (100%) rename {python_models8 => python_models}/neuron/neuron_models/my_neuron_model.py (100%) rename {python_models8 => python_models}/neuron/plasticity/__init__.py (100%) rename {python_models8 => python_models}/neuron/plasticity/stdp/__init__.py (100%) rename {python_models8 => python_models}/neuron/plasticity/stdp/timing_dependence/__init__.py (100%) rename {python_models8 => python_models}/neuron/plasticity/stdp/timing_dependence/my_timing_dependence.py (100%) rename {python_models8 => python_models}/neuron/plasticity/stdp/weight_dependence/__init__.py (100%) rename {python_models8 => python_models}/neuron/plasticity/stdp/weight_dependence/my_weight_dependence.py (100%) rename {python_models8 => python_models}/neuron/synapse_types/__init__.py (100%) rename {python_models8 => python_models}/neuron/synapse_types/my_synapse_type.py (100%) rename {python_models8 => python_models}/neuron/threshold_types/__init__.py (100%) rename {python_models8 => python_models}/neuron/threshold_types/my_threshold_type.py (100%) rename {python_models8 => python_models}/py.typed (100%) diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml index acc4750..ebea1ff 100644 --- a/.github/workflows/python_actions.yml +++ b/.github/workflows/python_actions.yml @@ -15,7 +15,7 @@ name: Python Actions on: [push] env: - CODE_PATHS: examples python_models8 nmt_integration_tests + CODE_PATHS: examples python_models nmt_integration_tests jobs: build: diff --git a/.ratexcludes b/.ratexcludes index 76acdf5..4f6a5c1 100644 --- a/.ratexcludes +++ b/.ratexcludes @@ -28,5 +28,5 @@ **/neural_modelling/builds/**/*.txt **/reports/** **/c_models/** -**/python_models8/** +**/python_models/** **/examples/** \ No newline at end of file diff --git a/c_models/Makefile b/c_models/Makefile index 1a9b5ba..75602bf 100644 --- a/c_models/Makefile +++ b/c_models/Makefile @@ -1,6 +1,6 @@ MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) CURRENT_DIR := $(abspath $(dir $(MAKEFILE_PATH))) -APP_OUTPUT_DIR := $(CURRENT_DIR)/../python_models8/model_binaries/ +APP_OUTPUT_DIR := $(CURRENT_DIR)/../python_models/model_binaries/ DIRS = makefiles diff --git a/c_models/makefiles/extra.mk b/c_models/makefiles/extra.mk index da2d051..475cd08 100644 --- a/c_models/makefiles/extra.mk +++ b/c_models/makefiles/extra.mk @@ -9,7 +9,7 @@ EXTRA_MODELS_DIR := $(abspath $(dir $(MAKEFILE_PATH))/../../)/ BUILD_DIR := $(EXTRA_MODELS_DIR)c_models/build/$(APP)/ # This is where the output .aplx files will go -APP_OUTPUT_DIR := $(EXTRA_MODELS_DIR)python_models8/model_binaries/ +APP_OUTPUT_DIR := $(EXTRA_MODELS_DIR)python_models/model_binaries/ # key for the database in this APP_OUTPUT_DIR # If you change APP_OUTPUT_DIR please use a lower case letter DATABASE_KEY = N diff --git a/c_models/makefiles/extra_neuron.mk b/c_models/makefiles/extra_neuron.mk index 52494a5..2c257bd 100644 --- a/c_models/makefiles/extra_neuron.mk +++ b/c_models/makefiles/extra_neuron.mk @@ -9,7 +9,7 @@ EXTRA_MODELS_DIR := $(abspath $(dir $(MAKEFILE_PATH))/../../)/ BUILD_DIR := $(EXTRA_MODELS_DIR)c_models/build/$(APP)/ # This is where the output .aplx files will go -APP_OUTPUT_DIR := $(EXTRA_MODELS_DIR)python_models8/model_binaries/ +APP_OUTPUT_DIR := $(EXTRA_MODELS_DIR)python_models/model_binaries/ # key for the database in this APP_OUTPUT_DIR # If you change APP_OUTPUT_DIR please use a lower case letter DATABASE_KEY = N diff --git a/c_models/makefiles/extra_synapse.mk b/c_models/makefiles/extra_synapse.mk index fd8817c..4b957e2 100644 --- a/c_models/makefiles/extra_synapse.mk +++ b/c_models/makefiles/extra_synapse.mk @@ -9,7 +9,7 @@ EXTRA_MODELS_DIR := $(abspath $(dir $(MAKEFILE_PATH))/../../)/ BUILD_DIR := $(EXTRA_MODELS_DIR)c_models/build/$(APP)/ # This is where the output .aplx files will go -APP_OUTPUT_DIR := $(EXTRA_MODELS_DIR)python_models8/model_binaries/ +APP_OUTPUT_DIR := $(EXTRA_MODELS_DIR)python_models/model_binaries/ # key for the database in this APP_OUTPUT_DIR # If you change APP_OUTPUT_DIR please use a lower case letter DATABASE_KEY = N diff --git a/doc/source/conf.py b/doc/source/conf.py index da4ad49..e9a5037 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -436,7 +436,7 @@ def excluded_because_in_init(base): _output_dir = os.path.abspath(".") -_package_base = "python_models8" +_package_base = "python_models" # Do the rst generation; remove files which aren't in git first! for fl in os.listdir("."): diff --git a/doc/source/modules.rst b/doc/source/modules.rst index 221edb1..eb120e6 100644 --- a/doc/source/modules.rst +++ b/doc/source/modules.rst @@ -1,10 +1,10 @@ -python_models8 +python_models ============== .. toctree:: :maxdepth: 4 - python_models8 + python_models examples ======== diff --git a/examples/my_example.py b/examples/my_example.py index 4d03c49..6a17077 100644 --- a/examples/my_example.py +++ b/examples/my_example.py @@ -4,23 +4,23 @@ import matplotlib.pyplot as plt # import models -from python_models8.neuron.plasticity.stdp.timing_dependence\ +from python_models.neuron.plasticity.stdp.timing_dependence\ .my_timing_dependence import ( MyTimingDependence) -from python_models8.neuron.plasticity.stdp.weight_dependence\ +from python_models.neuron.plasticity.stdp.weight_dependence\ .my_weight_dependence import ( MyWeightDependence) -from python_models8.neuron.builds.my_model_curr_exp import MyModelCurrExp -from python_models8.neuron.builds.my_full_neuron import MyFullNeuron -from python_models8.neuron.builds.my_if_curr_exp_sEMD import MyIFCurrExpSEMD -from python_models8.neuron.builds.my_model_curr_exp_my_input_type import ( +from python_models.neuron.builds.my_model_curr_exp import MyModelCurrExp +from python_models.neuron.builds.my_full_neuron import MyFullNeuron +from python_models.neuron.builds.my_if_curr_exp_sEMD import MyIFCurrExpSEMD +from python_models.neuron.builds.my_model_curr_exp_my_input_type import ( MyModelCurrExpMyInputType) -from python_models8.neuron.builds.my_model_curr_my_synapse_type import ( +from python_models.neuron.builds.my_model_curr_my_synapse_type import ( MyModelCurrMySynapseType) -from python_models8.neuron.builds.my_model_curr_exp_my_additional_input \ +from python_models.neuron.builds.my_model_curr_exp_my_additional_input \ import ( MyModelCurrExpMyAdditionalInput) -from python_models8.neuron.builds.my_model_curr_exp_my_threshold import ( +from python_models.neuron.builds.my_model_curr_exp_my_threshold import ( MyModelCurrExpMyThreshold) diff --git a/examples/my_sEMD_example.py b/examples/my_sEMD_example.py index 30c3277..4dbc1db 100644 --- a/examples/my_sEMD_example.py +++ b/examples/my_sEMD_example.py @@ -5,7 +5,7 @@ # imports import pyNN.spiNNaker as p -from python_models8.neuron.builds.my_if_curr_exp_sEMD import MyIFCurrExpSEMD +from python_models.neuron.builds.my_if_curr_exp_sEMD import MyIFCurrExpSEMD import datetime from pyNN.utility.plotting import Figure, Panel diff --git a/nmt_integration_tests/test_my_full_neuron.py b/nmt_integration_tests/test_my_full_neuron.py index bc14466..000b5d4 100644 --- a/nmt_integration_tests/test_my_full_neuron.py +++ b/nmt_integration_tests/test_my_full_neuron.py @@ -14,7 +14,7 @@ import pyNN.spiNNaker as sim from .nwt_testbase import NwtTestBase -from python_models8.neuron.builds.my_full_neuron import MyFullNeuron +from python_models.neuron.builds.my_full_neuron import MyFullNeuron # Set the run time of the execution run_time = 1000 diff --git a/nmt_integration_tests/test_my_if_curr_exp_semd.py b/nmt_integration_tests/test_my_if_curr_exp_semd.py index de48101..7176555 100644 --- a/nmt_integration_tests/test_my_if_curr_exp_semd.py +++ b/nmt_integration_tests/test_my_if_curr_exp_semd.py @@ -14,7 +14,7 @@ import pyNN.spiNNaker as sim from .nwt_testbase import NwtTestBase -from python_models8.neuron.builds.my_if_curr_exp_sEMD import MyIFCurrExpSEMD +from python_models.neuron.builds.my_if_curr_exp_sEMD import MyIFCurrExpSEMD # Set the run time of the execution run_time = 1000 diff --git a/nmt_integration_tests/test_my_model_curr_exp.py b/nmt_integration_tests/test_my_model_curr_exp.py index 728cade..875b0b4 100644 --- a/nmt_integration_tests/test_my_model_curr_exp.py +++ b/nmt_integration_tests/test_my_model_curr_exp.py @@ -14,7 +14,7 @@ import pyNN.spiNNaker as sim from .nwt_testbase import NwtTestBase -from python_models8.neuron.builds.my_model_curr_exp import MyModelCurrExp +from python_models.neuron.builds.my_model_curr_exp import MyModelCurrExp # Set the run time of the execution run_time = 1000 diff --git a/nmt_integration_tests/test_my_model_curr_exp_my_input_type.py b/nmt_integration_tests/test_my_model_curr_exp_my_input_type.py index 31d7564..a95f2cb 100644 --- a/nmt_integration_tests/test_my_model_curr_exp_my_input_type.py +++ b/nmt_integration_tests/test_my_model_curr_exp_my_input_type.py @@ -14,7 +14,7 @@ import pyNN.spiNNaker as sim from .nwt_testbase import NwtTestBase -from python_models8.neuron.builds.my_model_curr_exp_my_input_type import ( +from python_models.neuron.builds.my_model_curr_exp_my_input_type import ( MyModelCurrExpMyInputType) # Set the run time of the execution diff --git a/nmt_integration_tests/test_my_model_curr_exp_my_threshold.py b/nmt_integration_tests/test_my_model_curr_exp_my_threshold.py index e00a842..a80dacc 100644 --- a/nmt_integration_tests/test_my_model_curr_exp_my_threshold.py +++ b/nmt_integration_tests/test_my_model_curr_exp_my_threshold.py @@ -14,7 +14,7 @@ import pyNN.spiNNaker as sim from .nwt_testbase import NwtTestBase -from python_models8.neuron.builds.my_model_curr_exp_my_threshold import ( +from python_models.neuron.builds.my_model_curr_exp_my_threshold import ( MyModelCurrExpMyThreshold) # Set the run time of the execution diff --git a/nmt_integration_tests/test_my_model_curr_exp_stdp.py b/nmt_integration_tests/test_my_model_curr_exp_stdp.py index 5176a98..f5037a8 100644 --- a/nmt_integration_tests/test_my_model_curr_exp_stdp.py +++ b/nmt_integration_tests/test_my_model_curr_exp_stdp.py @@ -14,11 +14,11 @@ import pyNN.spiNNaker as sim from .nwt_testbase import NwtTestBase -from python_models8.neuron.builds.my_model_curr_exp import MyModelCurrExp -from python_models8.neuron.plasticity.stdp.timing_dependence\ +from python_models.neuron.builds.my_model_curr_exp import MyModelCurrExp +from python_models.neuron.plasticity.stdp.timing_dependence\ .my_timing_dependence import ( MyTimingDependence) -from python_models8.neuron.plasticity.stdp.weight_dependence\ +from python_models.neuron.plasticity.stdp.weight_dependence\ .my_weight_dependence import ( MyWeightDependence) diff --git a/nmt_integration_tests/test_my_model_curr_my_additional_input.py b/nmt_integration_tests/test_my_model_curr_my_additional_input.py index 3ac007f..d6a7e77 100644 --- a/nmt_integration_tests/test_my_model_curr_my_additional_input.py +++ b/nmt_integration_tests/test_my_model_curr_my_additional_input.py @@ -14,7 +14,7 @@ import pyNN.spiNNaker as sim from .nwt_testbase import NwtTestBase -from python_models8.neuron.builds.my_model_curr_exp_my_additional_input \ +from python_models.neuron.builds.my_model_curr_exp_my_additional_input \ import MyModelCurrExpMyAdditionalInput # Set the number of neurons to simulate diff --git a/nmt_integration_tests/test_my_model_curr_my_synapse_type.py b/nmt_integration_tests/test_my_model_curr_my_synapse_type.py index 5650c04..8f61b56 100644 --- a/nmt_integration_tests/test_my_model_curr_my_synapse_type.py +++ b/nmt_integration_tests/test_my_model_curr_my_synapse_type.py @@ -14,7 +14,7 @@ import pyNN.spiNNaker as sim from .nwt_testbase import NwtTestBase -from python_models8.neuron.builds.my_model_curr_my_synapse_type import ( +from python_models.neuron.builds.my_model_curr_my_synapse_type import ( MyModelCurrMySynapseType) # Set the run time of the execution diff --git a/python_models8/__init__.py b/python_models/__init__.py similarity index 84% rename from python_models8/__init__.py rename to python_models/__init__.py index 2f54dd7..dd2f891 100644 --- a/python_models8/__init__.py +++ b/python_models/__init__.py @@ -1,6 +1,6 @@ import os from spynnaker.pyNN.data import SpynnakerDataView -from python_models8 import model_binaries +from python_models import model_binaries # This adds the model binaries path to the paths searched by sPyNNaker SpynnakerDataView.register_binary_search_path( diff --git a/python_models8/_version.py b/python_models/_version.py similarity index 100% rename from python_models8/_version.py rename to python_models/_version.py diff --git a/python_models8/connectors/__init__.py b/python_models/connectors/__init__.py similarity index 100% rename from python_models8/connectors/__init__.py rename to python_models/connectors/__init__.py diff --git a/python_models8/connectors/my_connector.py b/python_models/connectors/my_connector.py similarity index 100% rename from python_models8/connectors/my_connector.py rename to python_models/connectors/my_connector.py diff --git a/python_models8/model_binaries/.gitignore b/python_models/model_binaries/.gitignore similarity index 100% rename from python_models8/model_binaries/.gitignore rename to python_models/model_binaries/.gitignore diff --git a/python_models8/model_binaries/__init__.py b/python_models/model_binaries/__init__.py similarity index 100% rename from python_models8/model_binaries/__init__.py rename to python_models/model_binaries/__init__.py diff --git a/python_models8/neuron/__init__.py b/python_models/neuron/__init__.py similarity index 100% rename from python_models8/neuron/__init__.py rename to python_models/neuron/__init__.py diff --git a/python_models8/neuron/additional_inputs/__init__.py b/python_models/neuron/additional_inputs/__init__.py similarity index 100% rename from python_models8/neuron/additional_inputs/__init__.py rename to python_models/neuron/additional_inputs/__init__.py diff --git a/python_models8/neuron/additional_inputs/my_additional_input.py b/python_models/neuron/additional_inputs/my_additional_input.py similarity index 100% rename from python_models8/neuron/additional_inputs/my_additional_input.py rename to python_models/neuron/additional_inputs/my_additional_input.py diff --git a/python_models8/neuron/builds/__init__.py b/python_models/neuron/builds/__init__.py similarity index 100% rename from python_models8/neuron/builds/__init__.py rename to python_models/neuron/builds/__init__.py diff --git a/python_models8/neuron/builds/my_full_neuron.py b/python_models/neuron/builds/my_full_neuron.py similarity index 84% rename from python_models8/neuron/builds/my_full_neuron.py rename to python_models/neuron/builds/my_full_neuron.py index 01cfa2b..24dd40e 100644 --- a/python_models8/neuron/builds/my_full_neuron.py +++ b/python_models/neuron/builds/my_full_neuron.py @@ -1,6 +1,6 @@ from spynnaker.pyNN.models.neuron import AbstractPyNNNeuronModel from spynnaker.pyNN.models.defaults import default_parameters -from python_models8.neuron.implementations.my_full_neuron_impl import ( +from python_models.neuron.implementations.my_full_neuron_impl import ( MyFullNeuronImpl) diff --git a/python_models8/neuron/builds/my_if_curr_exp_sEMD.py b/python_models/neuron/builds/my_if_curr_exp_sEMD.py similarity index 97% rename from python_models8/neuron/builds/my_if_curr_exp_sEMD.py rename to python_models/neuron/builds/my_if_curr_exp_sEMD.py index 1c49f9c..f779208 100644 --- a/python_models8/neuron/builds/my_if_curr_exp_sEMD.py +++ b/python_models/neuron/builds/my_if_curr_exp_sEMD.py @@ -4,7 +4,7 @@ from spynnaker.pyNN.models.neuron import AbstractPyNNNeuronModelStandard from spynnaker.pyNN.models.neuron.implementations import ModelParameter from spynnaker.pyNN.models.neuron.synapse_types import SynapseTypeExponential -from python_models8.neuron.input_types.my_input_type_semd import ( +from python_models.neuron.input_types.my_input_type_semd import ( MyInputTypeCurrentSEMD) from spynnaker.pyNN.models.neuron.threshold_types import ThresholdTypeStatic diff --git a/python_models8/neuron/builds/my_model_curr_exp.py b/python_models/neuron/builds/my_model_curr_exp.py similarity index 96% rename from python_models8/neuron/builds/my_model_curr_exp.py rename to python_models/neuron/builds/my_model_curr_exp.py index d102633..464ea08 100644 --- a/python_models8/neuron/builds/my_model_curr_exp.py +++ b/python_models/neuron/builds/my_model_curr_exp.py @@ -7,7 +7,7 @@ from spynnaker.pyNN.models.neuron.threshold_types import ThresholdTypeStatic # Additional components -from python_models8.neuron.neuron_models.my_neuron_model import MyNeuronModel +from python_models.neuron.neuron_models.my_neuron_model import MyNeuronModel from spynnaker.pyNN.models.defaults import default_initial_values diff --git a/python_models8/neuron/builds/my_model_curr_exp_my_additional_input.py b/python_models/neuron/builds/my_model_curr_exp_my_additional_input.py similarity index 93% rename from python_models8/neuron/builds/my_model_curr_exp_my_additional_input.py rename to python_models/neuron/builds/my_model_curr_exp_my_additional_input.py index 3342f5a..226e938 100644 --- a/python_models8/neuron/builds/my_model_curr_exp_my_additional_input.py +++ b/python_models/neuron/builds/my_model_curr_exp_my_additional_input.py @@ -6,9 +6,9 @@ from spynnaker.pyNN.models.neuron.synapse_types import SynapseTypeExponential from spynnaker.pyNN.models.neuron.threshold_types import ThresholdTypeStatic from spynnaker.pyNN.models.defaults import default_initial_values -from python_models8.neuron.additional_inputs.my_additional_input import ( +from python_models.neuron.additional_inputs.my_additional_input import ( MyAdditionalInput) -from python_models8.neuron.neuron_models.my_neuron_model import MyNeuronModel +from python_models.neuron.neuron_models.my_neuron_model import MyNeuronModel class MyModelCurrExpMyAdditionalInput(AbstractPyNNNeuronModelStandard): diff --git a/python_models8/neuron/builds/my_model_curr_exp_my_input_type.py b/python_models/neuron/builds/my_model_curr_exp_my_input_type.py similarity index 94% rename from python_models8/neuron/builds/my_model_curr_exp_my_input_type.py rename to python_models/neuron/builds/my_model_curr_exp_my_input_type.py index 08a0f1c..6963dd0 100644 --- a/python_models8/neuron/builds/my_model_curr_exp_my_input_type.py +++ b/python_models/neuron/builds/my_model_curr_exp_my_input_type.py @@ -9,9 +9,9 @@ from spynnaker.pyNN.models.defaults import default_initial_values # Additional components -from python_models8.neuron.input_types.my_input_type \ +from python_models.neuron.input_types.my_input_type \ import MyInputType -from python_models8.neuron.neuron_models.my_neuron_model \ +from python_models.neuron.neuron_models.my_neuron_model \ import MyNeuronModel diff --git a/python_models8/neuron/builds/my_model_curr_exp_my_threshold.py b/python_models/neuron/builds/my_model_curr_exp_my_threshold.py similarity index 92% rename from python_models8/neuron/builds/my_model_curr_exp_my_threshold.py rename to python_models/neuron/builds/my_model_curr_exp_my_threshold.py index 27c1047..810f54b 100644 --- a/python_models8/neuron/builds/my_model_curr_exp_my_threshold.py +++ b/python_models/neuron/builds/my_model_curr_exp_my_threshold.py @@ -4,8 +4,8 @@ from spynnaker.pyNN.models.neuron.input_types import InputTypeCurrent from spynnaker.pyNN.models.neuron.synapse_types import SynapseTypeExponential from spynnaker.pyNN.models.defaults import default_initial_values -from python_models8.neuron.neuron_models.my_neuron_model import MyNeuronModel -from python_models8.neuron.threshold_types.my_threshold_type import ( +from python_models.neuron.neuron_models.my_neuron_model import MyNeuronModel +from python_models.neuron.threshold_types.my_threshold_type import ( MyThresholdType) diff --git a/python_models8/neuron/builds/my_model_curr_my_synapse_type.py b/python_models/neuron/builds/my_model_curr_my_synapse_type.py similarity index 92% rename from python_models8/neuron/builds/my_model_curr_my_synapse_type.py rename to python_models/neuron/builds/my_model_curr_my_synapse_type.py index 669f919..a59aa52 100644 --- a/python_models8/neuron/builds/my_model_curr_my_synapse_type.py +++ b/python_models/neuron/builds/my_model_curr_my_synapse_type.py @@ -7,8 +7,8 @@ from spynnaker.pyNN.models.defaults import default_initial_values # Additional components -from python_models8.neuron.neuron_models.my_neuron_model import MyNeuronModel -from python_models8.neuron.synapse_types.my_synapse_type import MySynapseType +from python_models.neuron.neuron_models.my_neuron_model import MyNeuronModel +from python_models.neuron.synapse_types.my_synapse_type import MySynapseType class MyModelCurrMySynapseType(AbstractPyNNNeuronModelStandard): diff --git a/python_models8/neuron/implementations/__init__.py b/python_models/neuron/implementations/__init__.py similarity index 100% rename from python_models8/neuron/implementations/__init__.py rename to python_models/neuron/implementations/__init__.py diff --git a/python_models8/neuron/implementations/my_full_neuron_impl.py b/python_models/neuron/implementations/my_full_neuron_impl.py similarity index 100% rename from python_models8/neuron/implementations/my_full_neuron_impl.py rename to python_models/neuron/implementations/my_full_neuron_impl.py diff --git a/python_models8/neuron/input_types/__init__.py b/python_models/neuron/input_types/__init__.py similarity index 100% rename from python_models8/neuron/input_types/__init__.py rename to python_models/neuron/input_types/__init__.py diff --git a/python_models8/neuron/input_types/my_input_type.py b/python_models/neuron/input_types/my_input_type.py similarity index 100% rename from python_models8/neuron/input_types/my_input_type.py rename to python_models/neuron/input_types/my_input_type.py diff --git a/python_models8/neuron/input_types/my_input_type_semd.py b/python_models/neuron/input_types/my_input_type_semd.py similarity index 100% rename from python_models8/neuron/input_types/my_input_type_semd.py rename to python_models/neuron/input_types/my_input_type_semd.py diff --git a/python_models8/neuron/neuron_models/__init__.py b/python_models/neuron/neuron_models/__init__.py similarity index 100% rename from python_models8/neuron/neuron_models/__init__.py rename to python_models/neuron/neuron_models/__init__.py diff --git a/python_models8/neuron/neuron_models/my_neuron_model.py b/python_models/neuron/neuron_models/my_neuron_model.py similarity index 100% rename from python_models8/neuron/neuron_models/my_neuron_model.py rename to python_models/neuron/neuron_models/my_neuron_model.py diff --git a/python_models8/neuron/plasticity/__init__.py b/python_models/neuron/plasticity/__init__.py similarity index 100% rename from python_models8/neuron/plasticity/__init__.py rename to python_models/neuron/plasticity/__init__.py diff --git a/python_models8/neuron/plasticity/stdp/__init__.py b/python_models/neuron/plasticity/stdp/__init__.py similarity index 100% rename from python_models8/neuron/plasticity/stdp/__init__.py rename to python_models/neuron/plasticity/stdp/__init__.py diff --git a/python_models8/neuron/plasticity/stdp/timing_dependence/__init__.py b/python_models/neuron/plasticity/stdp/timing_dependence/__init__.py similarity index 100% rename from python_models8/neuron/plasticity/stdp/timing_dependence/__init__.py rename to python_models/neuron/plasticity/stdp/timing_dependence/__init__.py diff --git a/python_models8/neuron/plasticity/stdp/timing_dependence/my_timing_dependence.py b/python_models/neuron/plasticity/stdp/timing_dependence/my_timing_dependence.py similarity index 100% rename from python_models8/neuron/plasticity/stdp/timing_dependence/my_timing_dependence.py rename to python_models/neuron/plasticity/stdp/timing_dependence/my_timing_dependence.py diff --git a/python_models8/neuron/plasticity/stdp/weight_dependence/__init__.py b/python_models/neuron/plasticity/stdp/weight_dependence/__init__.py similarity index 100% rename from python_models8/neuron/plasticity/stdp/weight_dependence/__init__.py rename to python_models/neuron/plasticity/stdp/weight_dependence/__init__.py diff --git a/python_models8/neuron/plasticity/stdp/weight_dependence/my_weight_dependence.py b/python_models/neuron/plasticity/stdp/weight_dependence/my_weight_dependence.py similarity index 100% rename from python_models8/neuron/plasticity/stdp/weight_dependence/my_weight_dependence.py rename to python_models/neuron/plasticity/stdp/weight_dependence/my_weight_dependence.py diff --git a/python_models8/neuron/synapse_types/__init__.py b/python_models/neuron/synapse_types/__init__.py similarity index 100% rename from python_models8/neuron/synapse_types/__init__.py rename to python_models/neuron/synapse_types/__init__.py diff --git a/python_models8/neuron/synapse_types/my_synapse_type.py b/python_models/neuron/synapse_types/my_synapse_type.py similarity index 100% rename from python_models8/neuron/synapse_types/my_synapse_type.py rename to python_models/neuron/synapse_types/my_synapse_type.py diff --git a/python_models8/neuron/threshold_types/__init__.py b/python_models/neuron/threshold_types/__init__.py similarity index 100% rename from python_models8/neuron/threshold_types/__init__.py rename to python_models/neuron/threshold_types/__init__.py diff --git a/python_models8/neuron/threshold_types/my_threshold_type.py b/python_models/neuron/threshold_types/my_threshold_type.py similarity index 100% rename from python_models8/neuron/threshold_types/my_threshold_type.py rename to python_models/neuron/threshold_types/my_threshold_type.py diff --git a/python_models8/py.typed b/python_models/py.typed similarity index 100% rename from python_models8/py.typed rename to python_models/py.typed diff --git a/setup.cfg b/setup.cfg index 7a5b5e9..b738058 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,7 +14,7 @@ [metadata] name = sPyNNakerNewModelTemplate -version = attr: python_models8._version.__version__ +version = attr: python_models._version.__version__ description = SpiNNaker Template for New Models long_description = file: README.md long_description_content_type = text/markdown @@ -48,8 +48,8 @@ install_requires = [options.packages.find] include = - python_models8 - python_models8.* + python_models + python_models.* [options.package_data] * = diff --git a/unittests/test_import_all.py b/unittests/test_import_all.py index 0f63786..302b8fa 100644 --- a/unittests/test_import_all.py +++ b/unittests/test_import_all.py @@ -21,9 +21,9 @@ class ImportAllModule(unittest.TestCase): def test_import_all(self): if os.environ.get('CONTINUOUS_INTEGRATION', 'false').lower() == 'true': - package_loader.load_module("python_models8", remove_pyc_files=False) + package_loader.load_module("python_models", remove_pyc_files=False) else: # Do a full stack cleanup package_loader.load_module( "spinn_utilities", remove_pyc_files=True) - package_loader.load_module("python_models8", remove_pyc_files=True) + package_loader.load_module("python_models", remove_pyc_files=True)