feat: use jnml from PyNeuroML

Depends on: NeuroML/pyNeuroML#450

Author: sanjayankur31

omv/engines/getjnml.py

@@ -8,6 +8,7 @@
 
 
 def install_jnml(version):
+    """Install JNeuroML from GitHub tar."""
     if not version:
         version = "v0.14.0"
 

omv/engines/jneuroml.py

@@ -2,41 +2,21 @@
 import shutil
 import subprocess as sp
 from pathlib import Path
-import platform
 
 from omv.common.inout import inform, trim_path, is_verbose, check_output
 from omv.engines.engine import OMVEngine, EngineExecutionError
 
 
 class JNeuroMLEngine(OMVEngine):
     name = "jNeuroML"
+    e_name = "jnml"
 
     @staticmethod
     def get_environment():
         if "JNML_HOME" in os.environ:
             jnmlhome = os.environ["JNML_HOME"]
-        elif shutil.which("jnml") is not None:
-            jnmlhome = Path(shutil.which("jnml")).parent
-        else:
-            osname = platform.system()
-            if osname == "Linux":
-                try:
-                    jnmlhome = os.path.join(
-                        os.environ["XDG_DATA_HOME"], "jnml/jNeuroMLJar"
-                    )
-                except KeyError:
-                    localsharepath = os.path.join(os.environ["HOME"], ".local/share")
-                    if os.path.isdir(localsharepath):
-                        jnmlhome = os.path.join(
-                            os.environ["HOME"], ".local/share/jnml/jNeuroMLJar"
-                        )
-                    else:
-                        jnmlhome = os.path.join(os.environ["HOME"], "jnml/jNeuroMLJar")
-
-            elif osname == "Darwin":
-                jnmlhome = os.path.join(os.environ["HOME"], "Library/jnml/jNeuroMLJar")
-            else:
-                jnmlhome = os.path.join(os.environ["HOME"], "jnml/jNeuroMLJar")
+        elif shutil.which(JNeuroMLEngine.e_name) is not None:
+            jnmlhome = Path(shutil.which(JNeuroMLEngine.e_name)).parent
 
         environment_vars = {"JNML_HOME": jnmlhome}
 
@@ -46,7 +26,7 @@ def get_environment():
     def get_executable():
         environment_vars = JNeuroMLEngine.get_environment()
         jnml = os.path.join(
-            environment_vars["JNML_HOME"], "jnml" if os.name != "nt" else "jnml.bat"
+            environment_vars["JNML_HOME"], JNeuroMLEngine.e_name if os.name != "nt" else "jnml.bat"
         )
         return jnml
 
@@ -59,7 +39,6 @@ def is_installed():
                     "Checking whether %s is installed..." % JNeuroMLEngine.name,
                     indent=1,
                 )
-            FNULL = open(os.devnull, "w")
             jnml = JNeuroMLEngine.get_executable()
             r = check_output(
                 [jnml, "-v"], verbosity=2, env=JNeuroMLEngine.get_environment()
@@ -76,10 +55,10 @@ def is_installed():
 
     @staticmethod
     def install(version):
-        from omv.engines.getjnml import install_jnml
+        from omv.engines.getpyneuroml import install_pynml
 
-        inform("Will fetch and install jNeuroML jar", indent=2)
-        install_jnml(version)
+        inform("Will install PyNeuroML for jnml", indent=2)
+        install_pynml(version)
 
         if not JNeuroMLEngine.is_installed():
             inform("Failure to install, exiting", indent=1)