- Update to 0.7.2

3 files changed, 196 insertions, 116 deletions

diff --git a/science/pynn/Makefile b/science/pynn/Makefile
index e64095be6fa5..65c72bc85da3 100644
--- a/science/pynn/Makefile
+++ b/science/pynn/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pynn
-PORTVERSION=	0.6.0
+PORTVERSION=	0.7.2
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A simulator-independent language for building neuronal network models
 
 BUILD_DEPENDS=	${PYNUMPY}
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	${PYNUMPY}
 
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
diff --git a/science/pynn/distinfo b/science/pynn/distinfo
index a2ff3bdd7de7..277b81671182 100644
--- a/science/pynn/distinfo
+++ b/science/pynn/distinfo
@@ -1,2 +1,2 @@
-SHA256 (PyNN-0.6.0.tar.gz) = a1367e64b1cd83ac3eae7ee696a1d48e64656f62121e081e3d8449c21e18fbe8
-SIZE (PyNN-0.6.0.tar.gz) = 191346
+SHA256 (PyNN-0.7.2.tar.gz) = c1a55b3a7211fd257863c7865b8605c7b8eabd23abc11aceb33debe322ee103d
+SIZE (PyNN-0.7.2.tar.gz) = 254184
diff --git a/science/pynn/pkg-plist b/science/pynn/pkg-plist
index 40b24dffa252..7904e2f9d24e 100644
--- a/science/pynn/pkg-plist
+++ b/science/pynn/pkg-plist
@@ -1,138 +1,218 @@
 %%PYTHON_SITELIBDIR%%/pyNN/__init__.py
-%%PYTHON_SITELIBDIR%%/pyNN/connectors.py
+%%PYTHON_SITELIBDIR%%/pyNN/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/brian/__init__.py
+%%PYTHON_SITELIBDIR%%/pyNN/brian/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/brian/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/brian/connectors.py
+%%PYTHON_SITELIBDIR%%/pyNN/brian/connectors.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/brian/connectors.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/brian/electrodes.py
+%%PYTHON_SITELIBDIR%%/pyNN/brian/electrodes.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/brian/electrodes.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/brian/recording.py
+%%PYTHON_SITELIBDIR%%/pyNN/brian/recording.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/brian/recording.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/brian/simulator.py
+%%PYTHON_SITELIBDIR%%/pyNN/brian/simulator.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/brian/simulator.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/brian/standardmodels/__init__.py
+%%PYTHON_SITELIBDIR%%/pyNN/brian/standardmodels/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/brian/standardmodels/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/brian/standardmodels/cells.py
+%%PYTHON_SITELIBDIR%%/pyNN/brian/standardmodels/cells.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/brian/standardmodels/cells.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/brian/standardmodels/synapses.py
+%%PYTHON_SITELIBDIR%%/pyNN/brian/standardmodels/synapses.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/brian/standardmodels/synapses.pyo
 %%PYTHON_SITELIBDIR%%/pyNN/common.py
-%%PYTHON_SITELIBDIR%%/pyNN/utility.py
-%%PYTHON_SITELIBDIR%%/pyNN/cells.py
-%%PYTHON_SITELIBDIR%%/pyNN/random.py
-%%PYTHON_SITELIBDIR%%/pyNN/synapses.py
+%%PYTHON_SITELIBDIR%%/pyNN/common.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/common.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/connectors.py
+%%PYTHON_SITELIBDIR%%/pyNN/connectors.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/connectors.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/connectors2.py
+%%PYTHON_SITELIBDIR%%/pyNN/connectors2.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/connectors2.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/core.py
+%%PYTHON_SITELIBDIR%%/pyNN/core.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/core.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/descriptions/__init__.py
+%%PYTHON_SITELIBDIR%%/pyNN/descriptions/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/descriptions/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/descriptions/templates/cheetah/assembly_default.txt
+%%PYTHON_SITELIBDIR%%/pyNN/descriptions/templates/cheetah/modeltype_default.txt
+%%PYTHON_SITELIBDIR%%/pyNN/descriptions/templates/cheetah/population_default.txt
+%%PYTHON_SITELIBDIR%%/pyNN/descriptions/templates/cheetah/population_old.txt
+%%PYTHON_SITELIBDIR%%/pyNN/descriptions/templates/cheetah/populationview_default.txt
+%%PYTHON_SITELIBDIR%%/pyNN/descriptions/templates/cheetah/projection_default.txt
+%%PYTHON_SITELIBDIR%%/pyNN/descriptions/templates/cheetah/synapsedynamics_default.txt
+%%PYTHON_SITELIBDIR%%/pyNN/descriptions/templates/jinja2/assembly_default.txt
+%%PYTHON_SITELIBDIR%%/pyNN/descriptions/templates/jinja2/modeltype_default.txt
+%%PYTHON_SITELIBDIR%%/pyNN/descriptions/templates/jinja2/population_default.txt
+%%PYTHON_SITELIBDIR%%/pyNN/descriptions/templates/jinja2/population_old.txt
+%%PYTHON_SITELIBDIR%%/pyNN/descriptions/templates/jinja2/populationview_default.txt
+%%PYTHON_SITELIBDIR%%/pyNN/descriptions/templates/jinja2/projection_default.txt
+%%PYTHON_SITELIBDIR%%/pyNN/descriptions/templates/jinja2/synapsedynamics_default.txt
+%%PYTHON_SITELIBDIR%%/pyNN/descriptions/templates/string/assembly_default.txt
+%%PYTHON_SITELIBDIR%%/pyNN/descriptions/templates/string/modeltype_default.txt
+%%PYTHON_SITELIBDIR%%/pyNN/descriptions/templates/string/population_default.txt
+%%PYTHON_SITELIBDIR%%/pyNN/descriptions/templates/string/populationview_default.txt
+%%PYTHON_SITELIBDIR%%/pyNN/descriptions/templates/string/projection_default.txt
+%%PYTHON_SITELIBDIR%%/pyNN/descriptions/templates/string/synapsedynamics_default.txt
+%%PYTHON_SITELIBDIR%%/pyNN/errors.py
+%%PYTHON_SITELIBDIR%%/pyNN/errors.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/errors.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/models.py
+%%PYTHON_SITELIBDIR%%/pyNN/models.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/models.pyo
 %%PYTHON_SITELIBDIR%%/pyNN/multisim.py
-%%PYTHON_SITELIBDIR%%/pyNN/nest/recording.py
+%%PYTHON_SITELIBDIR%%/pyNN/multisim.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/multisim.pyo
 %%PYTHON_SITELIBDIR%%/pyNN/nest/__init__.py
-%%PYTHON_SITELIBDIR%%/pyNN/nest/connectors.py
-%%PYTHON_SITELIBDIR%%/pyNN/nest/simulator.py
-%%PYTHON_SITELIBDIR%%/pyNN/nest/cells.py
-%%PYTHON_SITELIBDIR%%/pyNN/nest/synapses.py
-%%PYTHON_SITELIBDIR%%/pyNN/nest/electrodes.py
-%%PYTHON_SITELIBDIR%%/pyNN/nest/recording.pyc
 %%PYTHON_SITELIBDIR%%/pyNN/nest/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyNN/nest/connectors.pyc
-%%PYTHON_SITELIBDIR%%/pyNN/nest/simulator.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/nest/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/nest/cells.py
 %%PYTHON_SITELIBDIR%%/pyNN/nest/cells.pyc
-%%PYTHON_SITELIBDIR%%/pyNN/nest/synapses.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/nest/cells.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/nest/connectors.py
+%%PYTHON_SITELIBDIR%%/pyNN/nest/connectors.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/nest/connectors.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/nest/electrodes.py
 %%PYTHON_SITELIBDIR%%/pyNN/nest/electrodes.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/nest/electrodes.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/nest/recording.py
+%%PYTHON_SITELIBDIR%%/pyNN/nest/recording.pyc
 %%PYTHON_SITELIBDIR%%/pyNN/nest/recording.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/nest/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/nest/connectors.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/nest/simulator.py
+%%PYTHON_SITELIBDIR%%/pyNN/nest/simulator.pyc
 %%PYTHON_SITELIBDIR%%/pyNN/nest/simulator.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/nest/cells.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/nest/standardmodels/__init__.py
+%%PYTHON_SITELIBDIR%%/pyNN/nest/standardmodels/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/nest/standardmodels/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/nest/standardmodels/cells.py
+%%PYTHON_SITELIBDIR%%/pyNN/nest/standardmodels/cells.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/nest/standardmodels/cells.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/nest/standardmodels/synapses.py
+%%PYTHON_SITELIBDIR%%/pyNN/nest/standardmodels/synapses.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/nest/standardmodels/synapses.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/nest/synapses.py
+%%PYTHON_SITELIBDIR%%/pyNN/nest/synapses.pyc
 %%PYTHON_SITELIBDIR%%/pyNN/nest/synapses.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/nest/electrodes.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/pcsim/recording.py
+%%PYTHON_SITELIBDIR%%/pyNN/neuroml.py
+%%PYTHON_SITELIBDIR%%/pyNN/neuroml.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/neuroml.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/__init__.py
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/cells.py
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/cells.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/cells.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/connectors.py
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/connectors.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/connectors.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/electrodes.py
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/electrodes.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/electrodes.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/nineml.py
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/nineml.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/nineml.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/nmodl/adexp.mod
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/nmodl/alphaisyn.mod
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/nmodl/alphasyn.mod
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/nmodl/expisyn.mod
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/nmodl/gsfa_grr.mod
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/nmodl/hh_traub.mod
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/nmodl/netstim2.mod
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/nmodl/refrac.mod
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/nmodl/reset.mod
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/nmodl/stdwa_guetig.mod
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/nmodl/stdwa_softlimits.mod
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/nmodl/stdwa_songabbott.mod
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/nmodl/stdwa_symm.mod
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/nmodl/tmgsyn.mod
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/nmodl/tmisyn.mod
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/nmodl/vecstim.mod
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/recording.py
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/recording.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/recording.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/simulator.py
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/simulator.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/simulator.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/standardmodels/__init__.py
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/standardmodels/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/standardmodels/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/standardmodels/cells.py
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/standardmodels/cells.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/standardmodels/cells.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/standardmodels/synapses.py
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/standardmodels/synapses.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/neuron/standardmodels/synapses.pyo
 %%PYTHON_SITELIBDIR%%/pyNN/pcsim/__init__.py
-%%PYTHON_SITELIBDIR%%/pyNN/pcsim/connectors.py
-%%PYTHON_SITELIBDIR%%/pyNN/pcsim/simulator.py
-%%PYTHON_SITELIBDIR%%/pyNN/pcsim/cells.py
-%%PYTHON_SITELIBDIR%%/pyNN/pcsim/synapses.py
-%%PYTHON_SITELIBDIR%%/pyNN/pcsim/connectors_old.py
-%%PYTHON_SITELIBDIR%%/pyNN/pcsim/electrodes.py
-%%PYTHON_SITELIBDIR%%/pyNN/pcsim/recording.pyc
 %%PYTHON_SITELIBDIR%%/pyNN/pcsim/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/pcsim/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/pcsim/connectors.py
 %%PYTHON_SITELIBDIR%%/pyNN/pcsim/connectors.pyc
-%%PYTHON_SITELIBDIR%%/pyNN/pcsim/simulator.pyc
-%%PYTHON_SITELIBDIR%%/pyNN/pcsim/cells.pyc
-%%PYTHON_SITELIBDIR%%/pyNN/pcsim/synapses.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/pcsim/connectors.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/pcsim/connectors_old.py
 %%PYTHON_SITELIBDIR%%/pyNN/pcsim/connectors_old.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/pcsim/connectors_old.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/pcsim/electrodes.py
 %%PYTHON_SITELIBDIR%%/pyNN/pcsim/electrodes.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/pcsim/electrodes.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/pcsim/recording.py
+%%PYTHON_SITELIBDIR%%/pyNN/pcsim/recording.pyc
 %%PYTHON_SITELIBDIR%%/pyNN/pcsim/recording.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/pcsim/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/pcsim/connectors.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/pcsim/simulator.py
+%%PYTHON_SITELIBDIR%%/pyNN/pcsim/simulator.pyc
 %%PYTHON_SITELIBDIR%%/pyNN/pcsim/simulator.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/pcsim/cells.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/pcsim/synapses.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/pcsim/connectors_old.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/pcsim/electrodes.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/neuron/recording.py
-%%PYTHON_SITELIBDIR%%/pyNN/neuron/__init__.py
-%%PYTHON_SITELIBDIR%%/pyNN/neuron/connectors.py
-%%PYTHON_SITELIBDIR%%/pyNN/neuron/simulator.py
-%%PYTHON_SITELIBDIR%%/pyNN/neuron/cells.py
-%%PYTHON_SITELIBDIR%%/pyNN/neuron/synapses.py
-%%PYTHON_SITELIBDIR%%/pyNN/neuron/electrodes.py
-%%PYTHON_SITELIBDIR%%/pyNN/neuron/recording.pyc
-%%PYTHON_SITELIBDIR%%/pyNN/neuron/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyNN/neuron/connectors.pyc
-%%PYTHON_SITELIBDIR%%/pyNN/neuron/simulator.pyc
-%%PYTHON_SITELIBDIR%%/pyNN/neuron/cells.pyc
-%%PYTHON_SITELIBDIR%%/pyNN/neuron/synapses.pyc
-%%PYTHON_SITELIBDIR%%/pyNN/neuron/electrodes.pyc
-%%PYTHON_SITELIBDIR%%/pyNN/neuron/recording.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/neuron/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/neuron/connectors.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/neuron/simulator.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/neuron/cells.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/neuron/synapses.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/neuron/electrodes.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/brian/recording.py
-%%PYTHON_SITELIBDIR%%/pyNN/brian/__init__.py
-%%PYTHON_SITELIBDIR%%/pyNN/brian/connectors.py
-%%PYTHON_SITELIBDIR%%/pyNN/brian/simulator.py
-%%PYTHON_SITELIBDIR%%/pyNN/brian/cells.py
-%%PYTHON_SITELIBDIR%%/pyNN/brian/synapses.py
-%%PYTHON_SITELIBDIR%%/pyNN/brian/electrodes.py
-%%PYTHON_SITELIBDIR%%/pyNN/brian/recording.pyc
-%%PYTHON_SITELIBDIR%%/pyNN/brian/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyNN/brian/connectors.pyc
-%%PYTHON_SITELIBDIR%%/pyNN/brian/simulator.pyc
-%%PYTHON_SITELIBDIR%%/pyNN/brian/cells.pyc
-%%PYTHON_SITELIBDIR%%/pyNN/brian/synapses.pyc
-%%PYTHON_SITELIBDIR%%/pyNN/brian/electrodes.pyc
-%%PYTHON_SITELIBDIR%%/pyNN/brian/recording.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/brian/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/brian/connectors.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/brian/simulator.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/brian/cells.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/brian/synapses.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/brian/electrodes.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/recording/files.py
+%%PYTHON_SITELIBDIR%%/pyNN/pcsim/standardmodels/__init__.py
+%%PYTHON_SITELIBDIR%%/pyNN/pcsim/standardmodels/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/pcsim/standardmodels/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/pcsim/standardmodels/cells.py
+%%PYTHON_SITELIBDIR%%/pyNN/pcsim/standardmodels/cells.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/pcsim/standardmodels/cells.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/pcsim/standardmodels/synapses.py
+%%PYTHON_SITELIBDIR%%/pyNN/pcsim/standardmodels/synapses.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/pcsim/standardmodels/synapses.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/random.py
+%%PYTHON_SITELIBDIR%%/pyNN/random.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/random.pyo
 %%PYTHON_SITELIBDIR%%/pyNN/recording/__init__.py
-%%PYTHON_SITELIBDIR%%/pyNN/recording/files.pyc
 %%PYTHON_SITELIBDIR%%/pyNN/recording/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyNN/recording/files.pyo
 %%PYTHON_SITELIBDIR%%/pyNN/recording/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/hoc/stdwa_songabbott.mod
-%%PYTHON_SITELIBDIR%%/pyNN/hoc/reset.mod
-%%PYTHON_SITELIBDIR%%/pyNN/hoc/stdwa_softlimits.mod
-%%PYTHON_SITELIBDIR%%/pyNN/hoc/stdwa_guetig.mod
-%%PYTHON_SITELIBDIR%%/pyNN/hoc/hh_traub.mod
-%%PYTHON_SITELIBDIR%%/pyNN/hoc/vecstim.mod
-%%PYTHON_SITELIBDIR%%/pyNN/hoc/refrac.mod
-%%PYTHON_SITELIBDIR%%/pyNN/hoc/alphasyn.mod
-%%PYTHON_SITELIBDIR%%/pyNN/hoc/adexp.mod
-%%PYTHON_SITELIBDIR%%/pyNN/hoc/netstim2.mod
-%%PYTHON_SITELIBDIR%%/pyNN/hoc/stdwa_symm.mod
-%%PYTHON_SITELIBDIR%%/pyNN/hoc/alphaisyn.mod
-%%PYTHON_SITELIBDIR%%/pyNN/hoc/expisyn.mod
-%%PYTHON_SITELIBDIR%%/pyNN/hoc/tmgsyn.mod
-%%PYTHON_SITELIBDIR%%/pyNN/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyNN/connectors.pyc
-%%PYTHON_SITELIBDIR%%/pyNN/common.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/recording/files.py
+%%PYTHON_SITELIBDIR%%/pyNN/recording/files.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/recording/files.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/space.py
+%%PYTHON_SITELIBDIR%%/pyNN/space.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/space.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/standardmodels/__init__.py
+%%PYTHON_SITELIBDIR%%/pyNN/standardmodels/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/standardmodels/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/standardmodels/cells.py
+%%PYTHON_SITELIBDIR%%/pyNN/standardmodels/cells.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/standardmodels/cells.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/standardmodels/synapses.py
+%%PYTHON_SITELIBDIR%%/pyNN/standardmodels/synapses.pyc
+%%PYTHON_SITELIBDIR%%/pyNN/standardmodels/synapses.pyo
+%%PYTHON_SITELIBDIR%%/pyNN/utility.py
 %%PYTHON_SITELIBDIR%%/pyNN/utility.pyc
-%%PYTHON_SITELIBDIR%%/pyNN/cells.pyc
-%%PYTHON_SITELIBDIR%%/pyNN/random.pyc
-%%PYTHON_SITELIBDIR%%/pyNN/synapses.pyc
-%%PYTHON_SITELIBDIR%%/pyNN/multisim.pyc
-%%PYTHON_SITELIBDIR%%/pyNN/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/connectors.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/common.pyo
 %%PYTHON_SITELIBDIR%%/pyNN/utility.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/cells.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/random.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/synapses.pyo
-%%PYTHON_SITELIBDIR%%/pyNN/multisim.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/pyNN/brian/standardmodels
+@dirrm %%PYTHON_SITELIBDIR%%/pyNN/brian
+@dirrm %%PYTHON_SITELIBDIR%%/pyNN/descriptions/templates/cheetah
+@dirrm %%PYTHON_SITELIBDIR%%/pyNN/descriptions/templates/jinja2
+@dirrm %%PYTHON_SITELIBDIR%%/pyNN/descriptions/templates/string
+@dirrm %%PYTHON_SITELIBDIR%%/pyNN/descriptions/templates
+@dirrm %%PYTHON_SITELIBDIR%%/pyNN/descriptions
+@dirrm %%PYTHON_SITELIBDIR%%/pyNN/nest/standardmodels
 @dirrm %%PYTHON_SITELIBDIR%%/pyNN/nest
-@dirrm %%PYTHON_SITELIBDIR%%/pyNN/pcsim
+@dirrm %%PYTHON_SITELIBDIR%%/pyNN/neuron/nmodl
+@dirrm %%PYTHON_SITELIBDIR%%/pyNN/neuron/standardmodels
 @dirrm %%PYTHON_SITELIBDIR%%/pyNN/neuron
-@dirrm %%PYTHON_SITELIBDIR%%/pyNN/brian
+@dirrm %%PYTHON_SITELIBDIR%%/pyNN/pcsim/standardmodels
+@dirrm %%PYTHON_SITELIBDIR%%/pyNN/pcsim
 @dirrm %%PYTHON_SITELIBDIR%%/pyNN/recording
-@dirrm %%PYTHON_SITELIBDIR%%/pyNN/hoc
+@dirrm %%PYTHON_SITELIBDIR%%/pyNN/standardmodels
 @dirrm %%PYTHON_SITELIBDIR%%/pyNN