More ruff fixes

Author: pgleeson

omv/autogen.py

@@ -27,7 +27,7 @@ def read_option(options, default=0):
     opt = None
     while opt is None:
         try:
-            sel = int(raw_input("Select option number [default: %s]: " % default))
+            sel = int(input("Select option number [default: %s]: " % default))
             opt = options[sel]
         except IndexError:
             print("invalid index!")

omv/common/inout.py

@@ -103,7 +103,7 @@ def check_output(cmds, cwd=".", shell=False, verbosity=0, env=None):
     if env:
         joint_env.update(env)
     for k in os.environ:
-        if not k in joint_env:
+        if k not in joint_env:
             joint_env[k] = os.environ[k]
 
     try:

omv/engines/engine.py

@@ -1,6 +1,5 @@
 from os.path import realpath
 from os import environ
-import sys
 from omv.common.inout import inform
 import platform
 
@@ -78,8 +77,8 @@ def build_query_string(self, name, cmd):
     def set_environment(self):
         if self.environment_vars:
             for name, val in self.environment_vars.items():
-                if name in environ and not "HOME" in name:
-                    if not ":%s:" % val in environ[name]:
+                if name in environ and "HOME" not in name:
+                    if ":%s:" % val not in environ[name]:
                         environ[name] = "%s:%s" % (environ[name], val)
                 else:
                     environ[name] = val

omv/engines/getarbor.py

@@ -8,7 +8,7 @@ def install_arbor(version=None):
         pip_install("arbor==%s" % version)
         import arbor
 
-        m = "Successfully installed Arbor..."
+        m = "Successfully installed Arbor %s..."%arbor.__version__
     except Exception as e:
         m = "ERROR installing Arbor: " + str(e)
     finally:

omv/engines/getbrian1.py

@@ -1,5 +1,4 @@
 import os
-import pip
 from omv.common.inout import inform, check_output
 from omv.engines.utils.wdir import working_dir
 

omv/engines/getbrian2.py

@@ -10,7 +10,7 @@ def install_brian2(version):
         pip_install("brian2", version)
         import brian2
 
-        m = "Successfully installed Brian2..."
+        m = "Successfully installed Brian2 %s..."%brian2.__version__
     except Exception as e:
         m = "ERROR installing Brian2: " + str(e)
     finally:

omv/engines/getxpp.py

@@ -3,9 +3,7 @@
 
 from omv.engines.utils.wdir import working_dir
 from sysconfig import get_paths
-import sys
 
-import fileinput
 
 
 def install_xpp(version="latest"):

omv/engines/jneuroml.py

@@ -24,7 +24,7 @@ def get_environment():
                     jnmlhome = os.path.join(
                         os.environ["XDG_DATA_HOME"], "jnml/jNeuroMLJar"
                     )
-                except KeyError as e:
+                except KeyError:
                     localsharepath = os.path.join(os.environ["HOME"], ".local/share")
                     if os.path.isdir(localsharepath):
                         jnmlhome = os.path.join(

omv/engines/moose_.py

@@ -3,7 +3,7 @@
 
 from omv.engines.pyneuroml_ import PyNeuroMLEngine
 
-from omv.common.inout import inform, trim_path, check_output, is_verbose
+from omv.common.inout import inform, trim_path, check_output
 from omv.engines.engine import OMVEngine, EngineExecutionError
 
 

omv/engines/nestsli.py

@@ -42,7 +42,7 @@ def is_installed():
             if "-" in ret:
                 ret = "v%s" % ret.split("-")[-1]
 
-            if not "v" in ret:
+            if "v" not in ret:
                 ret = "v%s" % ret
 
             inform("NEST %s is correctly installed..." % ret, indent=2, verbosity=1)