fix: apply black formatter

Signed-off-by: Frederic Pillon <[email protected]>

Author: fpistm

Diff for: cmake/scripts/ccwrapper.py

@@ -7,21 +7,30 @@
 import argparse
 
 parser = argparse.ArgumentParser()
-parser.add_argument("--source", "-i", type=pathlib.Path, required=True, help="input file being compiled")
-parser.add_argument("--logdir", "-d", type=pathlib.Path, required=True, help="log directory")
-parser.add_argument("cmd", action="extend", nargs="+", help="full compilation command (including -H etc...)")
+parser.add_argument(
+    "--source", "-i", type=pathlib.Path, required=True, help="input file being compiled"
+)
+parser.add_argument(
+    "--logdir", "-d", type=pathlib.Path, required=True, help="log directory"
+)
+parser.add_argument(
+    "cmd",
+    action="extend",
+    nargs="+",
+    help="full compilation command (including -H etc...)",
+)
 
 shargs = parser.parse_args()
 
-logline = re.compile("^\.* .+$") # a series of dots, a space, a filename
+logline = re.compile("^\.* .+$")  # a series of dots, a space, a filename
 
 
 proc = subprocess.run(shargs.cmd, capture_output=True, encoding="ascii")
-if proc.returncode != 0 :
+if proc.returncode != 0:
     exit(proc.returncode)
 
-with open(shargs.logdir/(shargs.source.name+".log"), "w") as file :
-    print(" "+str(shargs.source), file=file)
-    for line in io.StringIO(proc.stderr) :
-        if logline.match(line) :
-            print(line.rstrip(), file=file) # remove trailing '\n'
+with open(shargs.logdir / (shargs.source.name + ".log"), "w") as file:
+    print(" " + str(shargs.source), file=file)
+    for line in io.StringIO(proc.stderr):
+        if logline.match(line):
+            print(line.rstrip(), file=file)  # remove trailing '\n'

Diff for: cmake/scripts/cmake_core.py

@@ -15,7 +15,7 @@
 
 templates_dir = script_path / ".." / "templates"
 j2_env = Environment(
-loader=FileSystemLoader(str(templates_dir)), trim_blocks=True, lstrip_blocks=True
+    loader=FileSystemLoader(str(templates_dir)), trim_blocks=True, lstrip_blocks=True
 )
 cmake_template = j2_env.get_template("CMakeLists.txt")
 

Diff for: cmake/scripts/cmake_easy_setup.py

@@ -13,31 +13,55 @@
 from parse_boards import parse_file
 
 parser = argparse.ArgumentParser()
-parser.add_argument("--cli", "-x", type=pathlib.Path, required=False, default=shutil.which("arduino-cli"), help="path to arduino-cli")
+parser.add_argument(
+    "--cli",
+    "-x",
+    type=pathlib.Path,
+    required=False,
+    default=shutil.which("arduino-cli"),
+    help="path to arduino-cli",
+)
 parser.add_argument("--board", "-b", type=str, default="", help="board name")
-parser.add_argument("--fire", action="store_true", default=False, help="launch the build immediately (use with caution!)")
+parser.add_argument(
+    "--fire",
+    action="store_true",
+    default=False,
+    help="launch the build immediately (use with caution!)",
+)
 output_args = parser.add_mutually_exclusive_group(required=True)
-output_args.add_argument("--output", "-o", type=pathlib.Path, help="output file (CMake) with placeholders")
-output_args.add_argument("--sketch", "-s", type=pathlib.Path, help="output file (CMake) filled given a sketch folder")
+output_args.add_argument(
+    "--output", "-o", type=pathlib.Path, help="output file (CMake) with placeholders"
+)
+output_args.add_argument(
+    "--sketch",
+    "-s",
+    type=pathlib.Path,
+    help="output file (CMake) filled given a sketch folder",
+)
 
 shargs = parser.parse_args()
 shargs.board = shargs.board.upper()
 
-if shargs.sketch and not shargs.board :
-    print("""
+if shargs.sketch and not shargs.board:
+    print(
+        """
     Warning: you did not specify which board you were targeting;
     please review the generated CMakeLists.txt to remove the placeholder value before calling `cmake`.
-    """)
+    """
+    )
 
-if shargs.cli is None :
-    print("""
+if shargs.cli is None:
+    print(
+        """
     Error: `arduino-cli` not found in $PATH.
     Please install arduino-cli and make it available from your system $PATH,
     or give its location through the `--cli` argument.
-    """)
+    """
+    )
     exit(-1)
 
-def arduino(*args) :
+
+def arduino(*args):
     # return (out.stdout, logfile)
     # raises an exception if the command fails
     handle, logfile = tempfile.mkstemp()
@@ -50,47 +74,50 @@ def arduino(*args) :
     ).stdout
     return (out, logfile)
 
-def get_log(fname) :
-    with open(fname) as file :
-        for line in file :
+
+def get_log(fname):
+    with open(fname) as file:
+        for line in file:
             yield json.loads(line)
 
-def get_boards(boardstxt) :
+
+def get_boards(boardstxt):
 
     # we "reject" everything because we don't care about the values, only the keys
-    families = parse_file(boardstxt, lambda x:True)
+    families = parse_file(boardstxt, lambda x: True)
     del families["menu"]
 
     boards = set()
-    for fam, famcfg in families.items() :
+    for fam, famcfg in families.items():
         boards.update(famcfg.menu.pnum.keys())
 
     return boards
 
+
 _, logf = arduino("lib", "list")
 
-allboards = get_boards(pathlib.Path(__file__).parent.parent.parent/"boards.txt")
+allboards = get_boards(pathlib.Path(__file__).parent.parent.parent / "boards.txt")
 
 
-if shargs.board and shargs.board not in allboards :
+if shargs.board and shargs.board not in allboards:
     print(f"Unrecognized board name: '{shargs.board}'")
     print("Possible matches:")
     options = difflib.get_close_matches(shargs.board, allboards, n=9, cutoff=0.0)
     print("0. (keep as-is)")
-    for i, x in enumerate(options, start=1) :
+    for i, x in enumerate(options, start=1):
         print(f"{i}. {x}")
     choice = input("Choice number: ")
-    while not choice.isdecimal() :
+    while not choice.isdecimal():
         choice = input("Invalid choice *number*. Select a board: ")
     choice = int(choice)
-    if choice != 0 :
+    if choice != 0:
         choice -= 1
         shargs.board = options[choice]
 
 
 libpaths = dict()
-for line in get_log(logf) :
-    if line["msg"] == "Adding libraries dir" :
+for line in get_log(logf):
+    if line["msg"] == "Adding libraries dir":
         libpaths[line["location"]] = pathlib.Path(line["dir"])
 
 # platform lib path is already known, obviously, since that's where this script resides
@@ -99,18 +126,20 @@ def get_boards(boardstxt) :
 corepath = pathlib.Path(__file__).parent.parent.parent.resolve()
 
 j2_env = Environment(
-    loader=FileSystemLoader(str(corepath/"cmake"/"templates")), trim_blocks=True, lstrip_blocks=True
+    loader=FileSystemLoader(str(corepath / "cmake" / "templates")),
+    trim_blocks=True,
+    lstrip_blocks=True,
 )
 cmake_template = j2_env.get_template("easy_cmake.cmake")
 
 
 userhome = pathlib.Path.home()
-if userlibs.is_relative_to(userhome) :
+if userlibs.is_relative_to(userhome):
     userlibs = "~/" + str(userlibs.relative_to(userhome))
-if corepath.is_relative_to(userhome) :
+if corepath.is_relative_to(userhome):
     corepath = "~/" + str(corepath.relative_to(userhome))
 
-if shargs.sketch :
+if shargs.sketch:
     SOURCEFILE_EXTS = (".c", ".cpp", ".S", ".ino")
     sources = {
         file.relative_to(shargs.sketch)
@@ -123,37 +152,45 @@ def get_boards(boardstxt) :
         if file.is_file() and file.suffix in SOURCEFILE_EXTS
     }
     tgtname = shargs.sketch.resolve().name
-else :
+else:
     tgtname = ""
     sources = set()
 
 scriptname = pathlib.Path(__file__)
-if scriptname.is_relative_to(userhome) :
+if scriptname.is_relative_to(userhome):
     scriptname = "~/" + str(scriptname.relative_to(userhome))
 
-with open(shargs.output or shargs.sketch/"CMakeLists.txt", "w") as out :
-    out.write(cmake_template.render(
-        corepath=str(corepath).replace("\\", "\\\\"), # escape backslashes for CMake
-        userlibs=str(userlibs).replace("\\", "\\\\"),
-        libs=libs,
-        scriptfile=scriptname,
-        tgtname=tgtname,
-        scrcfiles=sources,
-        boardname=shargs.board,
-    ))
-
-
-print("Generated", shargs.output or shargs.sketch/"CMakeLists.txt")
-print("""
+with open(shargs.output or shargs.sketch / "CMakeLists.txt", "w") as out:
+    out.write(
+        cmake_template.render(
+            corepath=str(corepath).replace(
+                "\\", "\\\\"
+            ),  # escape backslashes for CMake
+            userlibs=str(userlibs).replace("\\", "\\\\"),
+            libs=libs,
+            scriptfile=scriptname,
+            tgtname=tgtname,
+            scrcfiles=sources,
+            boardname=shargs.board,
+        )
+    )
+
+
+print("Generated", shargs.output or shargs.sketch / "CMakeLists.txt")
+print(
+    """
 Unless you are building a very simple sketch with no library (e.g., Blink),
 you are advised to edit this file to fill in any missing dependency relationship.
 For details, please refer to
 https://github.com/massonal/Arduino_Core_STM32/wiki/Arduino-(in)compatibility#library-management
-""")
+"""
+)
 
-if shargs.fire :
-    if not (shargs.sketch and shargs.board) :
-        print("There remains some placeholder in the output file; I won't build _that_.")
+if shargs.fire:
+    if not (shargs.sketch and shargs.board):
+        print(
+            "There remains some placeholder in the output file; I won't build _that_."
+        )
         exit(1)
-    subprocess.run(("cmake", "-S", shargs.sketch, "-B", shargs.sketch/"build"))
-    subprocess.run(("cmake", "--build", shargs.sketch/"build"))
+    subprocess.run(("cmake", "-S", shargs.sketch, "-B", shargs.sketch / "build"))
+    subprocess.run(("cmake", "--build", shargs.sketch / "build"))