Fix new python lint errors discovered

.pre-commit-config.yaml

@@ -6,6 +6,7 @@
 
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
+exclude: addins/
 minimum_pre_commit_version: "4.0.0"
 repos:
   # Standard pre-commit hooks

.ruff.toml

@@ -1,6 +1,5 @@
 # Lint all .py files and extra python scripts without extensions
-include = ["*.py", "bin/wsim", "bin/regression-wally", "bin/iterelf", "sim/vcs/run_vcs"]
+exclude = ["addins/*"]
-exclude = ["addins/*", "tests/fp/quad/fpdatasetgen.py"]
 
 # Target oldest version of Python used (Python 3.9 for Ubuntu 20.04 LTS)
 target-version = "py39"

fpga/generator/probe

@@ -26,11 +26,12 @@
 
 import sys
 
+
 def usage():
-	print("Usage: ./probes name width probenum")
+  print("Usage: ./probes name width probenum")
 
 def header():
-	return """create_debug_core u_ila_0 ila
+  return """create_debug_core u_ila_0 ila
 
 set_property C_DATA_DEPTH 16384 [get_debug_cores u_ila_0]
 set_property C_TRIGIN_EN false [get_debug_cores u_ila_0]
@@ -49,49 +50,47 @@ endgroup
 connect_debug_port u_ila_0/clk [get_nets [list xlnx_ddr4_c0/inst/u_ddr4_infrastructure/addn_ui_clkout1 ]]"""
 
 def convertLine(x):
-	temp = x.split()
+  temp = x.split()
-	temp[1] = int(temp[1])
+  temp[1] = int(temp[1])
-	return tuple(temp)
+  return tuple(temp)
 
 def probeBits( probe ):
-	str = ''
+  string = ''
 
-	if (probe[1] > 1):
+  if (probe[1] > 1):
-		for i in range(probe[1]):
+    for i in range(probe[1]):
-			if i != (probe[1]-1):
+      if i != (probe[1]-1):
-				str = str + f"{{{probe[0]}[{i}]}} "
+        string = string + f"{{{probe[0]}[{i}]}} "
-			else:
+      else:
-				str = str + f"{{{probe[0]}[{i}]}} "
+        string = string + f"{{{probe[0]}[{i}]}} "
 
-	else:
+  else:
-		str = f'{{{probe[0]}}}'
+    string = f'{{{probe[0]}}}'
 
-	return str
+  return string
 
 def printProbe( probe, i ):
-	bits = probeBits(probe)
+  bits = probeBits(probe)
 
-	return (
+  return (
-	    f'create_debug_port u_ila_0 probe\n'
+      f'create_debug_port u_ila_0 probe\n'
-	    f'set_property port_width {probe[1]} [get_debug_ports u_ila_0/probe{i}]\n'
+      f'set_property port_width {probe[1]} [get_debug_ports u_ila_0/probe{i}]\n'
-	    f'set_property PROBE_TYPE DATA_AND_TRIGGER [get_debug_ports u_ila_0/probe{i}]\n'
+      f'set_property PROBE_TYPE DATA_AND_TRIGGER [get_debug_ports u_ila_0/probe{i}]\n'
-	    f'connect_debug_port u_ila_0/probe{i} [get_nets [list {bits}]]\n\n'
+      f'connect_debug_port u_ila_0/probe{i} [get_nets [list {bits}]]\n\n'
-	)
+  )
 
 def main(args):
-	if (len(args) != 3):
+  if (len(args) != 3):
-		usage()
+    usage()
 
-	name = args[0]
+  name = args[0]
-	width = int(args[1])
+  width = int(args[1])
-	probeNum = int(args[2])
+  probeNum = int(args[2])
 
 
-	probe = (name, width)
+  probe = (name, width)
 
-	print(printProbe(probe, probeNum))
+  print(printProbe(probe, probeNum))
 
 if __name__ == '__main__':
-	main(sys.argv[1:])
+  main(sys.argv[1:])
-
-	

fpga/probe

@@ -27,6 +27,7 @@
 
 import sys
 
+
 def usage():
     print("Usage: ./probes name width probenum")
     exit(1)
@@ -37,19 +38,19 @@ def convertLine(x):
     return tuple(temp)
 
 def probeBits( probe ):
-    str = ''
+    string = ''
 
     if (probe[1] > 1):
         for i in range(probe[1]):
             if i != (probe[1]-1):
-                str = str + f"{{{probe[0]}[{i}]}} "
+                string = string + f"{{{probe[0]}[{i}]}} "
             else:
-                str = str + f"{{{probe[0]}[{i}]}} "
+                string = string + f"{{{probe[0]}[{i}]}} "
 
     else:
-        str = f'{{{probe[0]}}}'
+        string = f'{{{probe[0]}}}'
 
-    return str
+    return string
 
 def printProbe( probe, i ):
     bits = probeBits(probe)

fpga/proberange

@@ -27,6 +27,7 @@
 
 import sys
 
+
 def usage():
   print("Usage: ./probes list_of_probes outfile")
 
@@ -56,19 +57,19 @@ def convertLine(x):
   return tuple(temp)
 
 def probeBits( probe ):
-  str = ''
+  string = ''
 
   if (probe[1] > 1):
     for i in range(probe[1]):
       if i != (probe[1]-1):
-        str = str + f"{{{probe[0]}[{i}]}} "
+        string = string + f"{{{probe[0]}[{i}]}} "
       else:
-        str = str + f"{{{probe[0]}[{i}]}} "
+        string = string + f"{{{probe[0]}[{i}]}} "
 
   else:
-    str = f'{{{probe[0]}}}'
+    string = f'{{{probe[0]}}}'
 
-  return str
+  return string
 
 def printProbe( probe,):
   bits = probeBits(probe)

fpga/probes

@@ -27,6 +27,7 @@
 
 import sys
 
+
 def usage():
   print("Usage: ./probes list_of_probes outfile")
 
@@ -55,19 +56,19 @@ def convertLine(x):
   return tuple(temp)
 
 def probeBits( probe ):
-  str = ''
+  string = ''
 
   if (probe[1] > 1):
     for i in range(probe[1]):
       if i != (probe[1]-1):
-        str = str + f"{{{probe[0]}[{i}]}} "
+        string = string + f"{{{probe[0]}[{i}]}} "
       else:
-        str = str + f"{{{probe[0]}[{i}]}} "
+        string = string + f"{{{probe[0]}[{i}]}} "
 
   else:
-    str = f'{{{probe[0]}}}'
+    string = f'{{{probe[0]}}}'
 
-  return str
+  return string
 
 def printProbe( probe, i ):
   bits = probeBits(probe)