Merge branch 'development' into test_nest

* development:
  version argument
  Test with pynn 0.10.0, nest 3.1, nrn 8.0.0

Author: pgleeson

omv/engines/getnest.py

@@ -8,7 +8,7 @@
 def install_nest(version):
 
     if not version:
-        version='2.20.0'
+        version='3.1'
 
     inform('Installing NEST', indent=2, verbosity=1)
     nestpath = os.path.join(os.environ['HOME'],'nest')

omv/engines/getnrn.py

@@ -11,7 +11,7 @@
 def install_neuron(version):
     if not version:
         if sys.version_info.major == 3:
-            version='7.8.2'
+            version='8.0.0' # 8.0.0 works with pynn 0.10.0
         else:
             version='7.6'
 

omv/engines/getpynn.py

@@ -4,7 +4,11 @@
 
 from omv.engines.utils.wdir import working_dir
 
-def install_pynn():
+def install_pynn(version):
+
+    if not version:
+        version='0.10.0'
+
     try:
 
         #pip_install('lazyarray')  # This should ideally be automatically installed with PyNN...
@@ -19,7 +23,7 @@ def install_pynn():
         path = os.path.join(install_root, pyNN_src)
 
         with working_dir(path):
-            print(check_output(['git','checkout','0.9.6']))  # neuroml branch has the latest NML2 import/export code!
+            print(check_output(['git','checkout',version]))  # neuroml branch has the latest NML2 import/export code!
             #check_output(['git','checkout','master'])
             #print(check_output(['python', 'setup.py', 'install']))
             pip_install('.')

omv/engines/pynn.py

@@ -33,7 +33,7 @@ def install(version):
         from omv.engines.getpynn import install_pynn
         home = os.environ['HOME']
         inform('Will fetch and install the latest pyNN', indent=2)
-        install_pynn()
+        install_pynn(version)
         inform('Done, PyNN is correctly installed...', indent=2)
 
 

omv/omv_util.py

@@ -287,7 +287,7 @@ def _install_engine(eng):
                 install_nest(engine_version)
         elif eng.lower() == 'PyNN'.lower():
             from omv.engines.getpynn import install_pynn
-            install_pynn()
+            install_pynn(engine_version)
 
         elif eng.lower() == 'PyNN_NEURON'.lower():
             from omv.engines.pynnneuron import PyNNNRNEngine