Ran ruff on python

Author: pgleeson

doc/conf.py

@@ -11,8 +11,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
 import os
+import sys
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the

examples/loadtest.py

@@ -1,8 +1,9 @@
 #! /usr/bin/python
 
-from lems.model.model import Model
 import sys
 
+from lems.model.model import Model
+
 model = Model()
 
 file_name = "examples/hhcell.xml"

lems/api.py

@@ -5,9 +5,9 @@
 :organization: LEMS (https://github.com/organizations/LEMS)
 """
 
-from lems.model.fundamental import *
-from lems.model.structure import *
-from lems.model.dynamics import *
-from lems.model.simulation import *
 from lems.model.component import *
+from lems.model.dynamics import *
+from lems.model.fundamental import *
 from lems.model.model import Model
+from lems.model.simulation import *
+from lems.model.structure import *

lems/base/util.py

@@ -7,7 +7,6 @@
 
 from lems import __schema_location__
 
-
 id_counter = 0
 
 

lems/dlems/exportdlems.py

@@ -5,16 +5,14 @@
 :author: Boris Marin
 """
 
-import sys
-import re
 import json
+import re
+import sys
 from collections import OrderedDict
 
+from lems.model.dynamics import OnCondition, OnStart, StateAssignment
 from lems.model.model import Model
-from lems.sim.build import order_derived_variables, order_derived_parameters
-from lems.model.dynamics import OnStart
-from lems.model.dynamics import OnCondition
-from lems.model.dynamics import StateAssignment
+from lems.sim.build import order_derived_parameters, order_derived_variables
 
 SI_PREF = {"p": 1e-12, "n": 1e-9, "u": 1e-6, "m": 1e-3, "c": 1e-2}
 

lems/model/component.py

@@ -5,15 +5,15 @@
 :organization: LEMS (https://github.com/organizations/LEMS)
 """
 
+from xml.sax.saxutils import quoteattr
+
 from lems.base.base import LEMSBase
-from lems.base.map import Map
 from lems.base.errors import ModelError, ParseError
-
+from lems.base.map import Map
 from lems.model.dynamics import Dynamics
-from lems.model.structure import Structure
 from lems.model.simulation import Simulation
+from lems.model.structure import Structure
 from lems.parser.expr import ExprParser
-from xml.sax.saxutils import quoteattr
 
 
 class Parameter(LEMSBase):

lems/model/dynamics.py

@@ -6,8 +6,8 @@
 """
 
 from lems.base.base import LEMSBase
-from lems.base.map import Map
 from lems.base.errors import ModelError, ParseError
+from lems.base.map import Map
 from lems.parser.expr import ExprParser
 
 

lems/model/model.py

@@ -369,7 +369,7 @@ def export_to_dom(self):
             xmldom = minidom.parseString(xmlstr)
         except ExpatError as er:
             print("Parsing error:", errors.messages[er.code])
-            print("at: " + xmlstr[er.offset - 50: er.offset + 50])
+            print("at: " + xmlstr[er.offset - 50 : er.offset + 50])
             print("at: " + ("-" * 50) + "^")
             raise
         return xmldom

lems/model/structure.py

@@ -6,8 +6,8 @@
 """
 
 from lems.base.base import LEMSBase
-from lems.base.map import Map
 from lems.base.errors import ModelError
+from lems.base.map import Map
 
 
 class With(LEMSBase):
@@ -273,7 +273,7 @@ def __init__(self, component=None, number=None, component_type=None):
         :type: str """
 
         self.number = number
-        """ Name of the paramter specifying the number of times the component 
+        """ Name of the paramter specifying the number of times the component
         reference is to be instantiated.
 
         :type: str"""

lems/parser/LEMS.py

@@ -47,6 +47,7 @@ def get_nons_attribute(attribute):
     else:
         return "%s:%s" % (bits[0], bits[1])
 
+
 def get_nons_tag_from_node(node):
     """Get tags without namespace prefixes.
 
@@ -86,6 +87,7 @@ class LEMSXMLNode:
     attributes with their corresponding Component definitions (because LEMS
     does not know what XML namespaces are).
     """
+
     def __init__(self, pyxmlnode):
         self.tag = get_nons_tag_from_node(pyxmlnode)
         self.ltag = self.tag.lower()