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)

omv/engines/neuron_.py

@@ -42,7 +42,7 @@ def get_nrn_environment():
 
         environment_vars = {"PYTHONPATH": pp}
 
-        if not "NEURON_HOME" in os.environ:
+        if "NEURON_HOME" not in os.environ:
             pip_install_dir1 = "/usr/local"
             pip_install_nrniv1 = os.path.join(pip_install_dir1, "bin", "nrniv")
             scripts_bin = get_paths()["scripts"]

omv/engines/pylems.py

@@ -1,6 +1,5 @@
 import os
 import subprocess as sp
-import sys
 
 from omv.common.inout import inform, trim_path, check_output, is_verbose
 from omv.engines.engine import OMVEngine, EngineExecutionError

omv/engines/pyneuroml_.py

@@ -1,7 +1,7 @@
 import os
 import subprocess as sp
 
-from omv.common.inout import inform, trim_path, is_verbose, check_output
+from omv.common.inout import inform, trim_path, check_output
 from omv.engines.engine import OMVEngine, EngineExecutionError
 
 

omv/engines/pyneuromlvalidatesbml.py

@@ -1,7 +1,7 @@
 import os
 import subprocess as sp
 
-from omv.common.inout import inform, trim_path, check_output
+from omv.common.inout import inform, check_output
 from omv.engines.engine import EngineExecutionError
 from omv.engines.pyneuroml_ import PyNeuroMLEngine
 from omv.engines.engine import PATH_DELIMITER

omv/engines/pyneuromlxpp.py

@@ -1,11 +1,9 @@
 import os
 import subprocess as sp
 
-from omv.common.inout import inform, trim_path, check_output
+from omv.common.inout import inform, check_output
 from omv.engines.engine import EngineExecutionError
 from omv.engines.pyneuroml_ import PyNeuroMLEngine
-from omv.engines.engine import PATH_DELIMITER
-from omv.engines.utils import resolve_paths
 
 
 class PyNeuroMLXppEngine(PyNeuroMLEngine):

omv/engines/pyneuron.py

@@ -6,7 +6,7 @@
 
 from omv.engines.neuron_ import NeuronEngine
 
-from omv.common.inout import inform, is_verbose, check_output
+from omv.common.inout import inform, is_verbose
 from omv.engines.engine import EngineExecutionError
 
 

omv/engines/pynn.py

@@ -1,7 +1,7 @@
 import os
 import subprocess as sp
 
-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/utils/__init__.py

@@ -1,9 +1,10 @@
 from omv.engines.engine import PATH_DELIMITER
 
+
 def resolve_paths(path_s):
-    '''
+    """
     Make explicit list from: '*.nml myfile.xml' etc.
-    '''
+    """
 
     if "*" in path_s:
         import glob
@@ -18,4 +19,3 @@ def resolve_paths(path_s):
             path_s = glob.glob(path_s)
 
     return path_s
-

omv/engines/xpp.py

@@ -1,5 +1,4 @@
 import os
-import sys
 
 import subprocess as sp
 
@@ -39,7 +38,7 @@ def is_installed():
 
             else:
                 ret = "%s" % r.split()[2]
-                if not "v" in ret:
+                if "v" not in ret:
                     ret = "v%s" % ret
 
             inform("XPP %s is correctly installed..." % ret, indent=2, verbosity=1)

omv/find_tests.py

@@ -93,7 +93,7 @@ def test_all(
         engs = {}
         tot_tests = 0
         for t in tallies:
-            if not t.engine in engs:
+            if t.engine not in engs:
                 engs[t.engine] = 0
             engs[t.engine] += 1
             tot_tests += 1

omv/omv_util.py

@@ -156,7 +156,7 @@ def main():
                 try:
                     exec("import %s" % m)
                     installed_ver = "v%s" % eval("%s.__version__" % m)
-                except:
+                except Exception:
                     pass
                 inform(
                     "  %s%s(installed: %s)" % (m, " " * (30 - len(m)), installed_ver)

omv/parse_omt.py

@@ -20,7 +20,7 @@ def parse_omt(omt_path, do_not_run=False, engine_version=None, ignore_non_py3=Fa
     )
 
     mepomt = OMVTestParser(omt_path)
-    if not mepomt.engine in OMVEngines:
+    if mepomt.engine not in OMVEngines:
         inform(
             "Error! Unrecognised engine: %s (try running: omv list-engines)"
             % mepomt.engine

omv/tally.py

@@ -21,7 +21,7 @@ def add_experiment(self, exp, results):
         self.experiments[exp.name] = results
 
     def __lt__(self, other):
-        if other.mep == None:
+        if other.mep is None:
             return True
         return self.omt < other.omt
 
@@ -44,17 +44,17 @@ class TallyHolder(object):
     all_engines = []
 
     def add(self, tally):
-        if not tally.engine in self.all_engines:
+        if tally.engine not in self.all_engines:
             self.all_engines.append(tally.engine)
 
         mp = trim_path(tally.modelpath)
 
-        if not mp in self.tallies:
+        if mp not in self.tallies:
             self.tallies[mp] = {}
 
         mptallies = self.tallies[mp]
 
-        if not tally.engine in mptallies:
+        if tally.engine not in mptallies:
             mptallies[tally.engine] = []
 
         mptallies[tally.engine].append(tally)
@@ -84,7 +84,7 @@ def summary(self):
             mptallies = self.tallies[mp]
 
             for engine in self.all_engines:
-                if not engine in mptallies:
+                if engine not in mptallies:
                     info = "%s" % (" ")
                     summary += " " * (len(engine) - len(info) - 2) + info + " |   "
                 else:

utilities/test_all_osb_projects.py

@@ -9,7 +9,6 @@
 import shutil
 import datetime
 import pprint
-import sys
 
 from subprocess import check_output as co
 from omv.find_tests import test_all
@@ -215,7 +214,7 @@
                 try:
                     test_all(ignore_non_py3=True)
                     passing_projects += 1
-                except:
+                except Exception:
                     passed = 0
                     failing_projects += 1
                     fails.append(target_dir)