Updates towards NeuroML/jNeuroML#54

Change to v0.3.5
NeuroML · Nov 16, 2017 · 1a5f4ee · 1a5f4ee
1 parent a8a9b4b
commit 1a5f4ee
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/pyneuroml/__init__.py b/pyneuroml/__init__.py
@@ -1,5 +1,5 @@
 
 
-__version__ = '0.3.4'
+__version__ = '0.3.5'
 
 JNEUROML_VERSION = '0.8.3'
diff --git a/pyneuroml/lems/__init__.py b/pyneuroml/lems/__init__.py
@@ -215,7 +215,7 @@ def generate_lems_file_for_neuroml(sim_id,
 
     ls.save_to_file(file_name=file_name_full)
 
-    return quantities_saved
+    return quantities_saved, ls
 
 
 # Mainly for NEURON etc.

diff --git a/pyneuroml/pynml.py b/pyneuroml/pynml.py
@@ -548,6 +548,7 @@ def run_lems_with_jneuroml_neuron(lems_file_name,
                                   show_plot_already = True, 
                                   exec_in_dir = ".",
                                   only_generate_scripts = False,
+                                  compile_mods = True,
                                   verbose = DEFAULTS['v'],
                                   exit_on_fail = True,
                                   cleanup=False):
@@ -559,6 +560,8 @@ def run_lems_with_jneuroml_neuron(lems_file_name,
     post_args = " -neuron"
     if not only_generate_scripts:# and jnml_runs_neuron:
         post_args += ' -run'
+    if compile_mods:
+        post_args += ' -compile'
 
     post_args += gui_string(nogui)
     post_args += include_string(paths_to_include)
@@ -575,7 +578,7 @@ def run_lems_with_jneuroml_neuron(lems_file_name,
             if not path+":" in os.environ['PYTHONPATH']:
                 os.environ['PYTHONPATH'] = '%s:%s'%(path,os.environ['PYTHONPATH'])
 
-        print_comment('PYTHONPATH for NEURON: %s'%os.environ['PYTHONPATH'], verbose)
+        #print_comment('PYTHONPATH for NEURON: %s'%os.environ['PYTHONPATH'], verbose)
 
         success = run_jneuroml("", 
                            lems_file_name,