Merge pull request #109 from OpenSourceBrain/test_arbor_eden

To v0.2.10; update eden version used
OpenSourceBrain · Aug 10, 2023 · 4ff8207 · 4ff8207
2 parents c079c88 + b517053
commit 4ff8207
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -122,3 +122,4 @@ report*.txt
 /utilities/tests/*.gen.c
 /utilities/tests/*_eden.py
 arm64
+/*ken.sh
diff --git a/omv/engines/geteden.py b/omv/engines/geteden.py
@@ -1,6 +1,6 @@
 from omv.common.inout import pip_install
 
-DEFAULT_VERSION = "0.2.1"
+DEFAULT_VERSION = "0.2.2"
 
 
 def install_eden(version=None):

diff --git a/omv/engines/jneuroml.py b/omv/engines/jneuroml.py
@@ -32,7 +32,7 @@ def get_environment():
                         )
                     else:
                         jnmlhome = os.path.join(os.environ["HOME"], "jnml/jNeuroMLJar")
-                        
+
             elif osname == "Darwin":
                 jnmlhome = os.path.join(os.environ["HOME"], "Library/jnml/jNeuroMLJar")
             else:

diff --git a/omv/engines/jneuromleden.py b/omv/engines/jneuromleden.py
@@ -24,7 +24,7 @@ def install(version):
         if not JNeuroMLEngine.is_installed():
             JNeuroMLEngine.install(None)
         if not EdenEngine.is_installed():
-            EdenEngine.install(None)
+            EdenEngine.install(version)
 
         JNeuroMLEdenEngine.path = JNeuroMLEngine.path + ":" + EdenEngine.path
         JNeuroMLEdenEngine.environment_vars = {}

diff --git a/omv/find_tests.py b/omv/find_tests.py
@@ -102,7 +102,7 @@ def test_all(
         for e in sorted(engs):
             inform(
                 "  Engine %s %s tests\t(installed: %s)"
-                % (e+':'+' '*(21-len(e)), engs[e], OMVEngines[e].is_installed())
+                % (e + ":" + " " * (21 - len(e)), engs[e], OMVEngines[e].is_installed())
             )
 
         inform("")

diff --git a/omv/omv_util.py b/omv/omv_util.py
@@ -415,6 +415,14 @@ def _install_engine(eng):
             else:
                 ee.install(engine_version)
 
+        elif eng.lower() == "jNeuroML_EDEN".lower():
+            from omv.engines.jneuromleden import JNeuroMLEdenEngine as ee
+
+            if ee.is_installed():
+                already_installed = True
+            else:
+                ee.install(engine_version)
+
         else:
             inform(
                 "Code not implemented yet for installing %s using: omv install! Try running a test using this engine."

diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = OSBModelValidation
-version = 0.2.9
+version = 0.2.10
 author = Boris Marin, Padraig Gleeson
 author_email = [email protected]
 url = https://github.com/OpenSourceBrain/osb-model-validation