lint: fix black error report

Author: fvalette-ledger

src/outpost/barbican/_internals/cargo_config.py

@@ -35,6 +35,7 @@ def run_cargo_config(rustargs: Path, target: Path, extra_args: str, outdir: Path
 
     (outdir / ".cargo" / "config.toml").write_text(config)
 
+
 def argument_parser() -> ArgumentParser:
     parser = ArgumentParser()
     parser.add_argument("--rustargs-file", type=Path, help="rustargs file path")

src/outpost/barbican/_internals/gen_task_metadata_bin.py

@@ -105,4 +105,6 @@ def argument_parser() -> ArgumentParser:
 def run(argv: T.List[str]) -> None:
     args = argument_parser().parse_args(argv)
     # XXX: use builddir as option
-    run_gen_task_metadata_bin(args.input, args.output, ProjectPath.load(args.projectdir / "build"))
+    run_gen_task_metadata_bin(
+        args.input, args.output, ProjectPath.load(args.projectdir / "output" / "build")
+    )

src/outpost/barbican/barbican.py

@@ -156,15 +156,14 @@ def setup(self) -> None:
                     package.installed_targets[0],
                     package.dummy_linked_targets[0],
                     dummy_linker_script,
-                    package_name=package.name if package.backend == Backend.Meson else "kernel"
+                    package_name=package.name if package.backend == Backend.Meson else "kernel",
                 )
 
         layout_sys_exelist = []
         layout_app_exelist = []
         for package in self._packages:
             if package.is_sys_package:
                 layout_sys_exelist.extend(package.installed_targets)
-            #elif package.backend == Backend.Meson:
             else:
                 layout_app_exelist.extend(package.dummy_linked_targets)
 
@@ -183,7 +182,6 @@ def setup(self) -> None:
 
         # gen_ld/relink/gen_meta/objcopy app(s)
         for package in self._packages:
-            #if package.is_application and package.backend == Backend.Meson:
             if package.is_application:
                 # XXX: Handle multiple exe package
                 elf_in = package.installed_targets[0]

src/outpost/barbican/buildsys/ninja_backend.py

@@ -282,8 +282,8 @@ def add_cargo_rules(self, rustargs: Path, rust_target: Path) -> None:
             description="cargo compile $name",
             pool="console",
             command="cd $builddir "
-             + " && config=$config $cargo build --manifest-path=$sourcedir/Cargo.toml --release"
-             + " && touch $out && cd -",
+            + " && config=$config $cargo build --manifest-path=$sourcedir/Cargo.toml --release"
+            + " && touch $out && cd -",
         )
         self._ninja.newline()
         self._ninja.rule(
@@ -302,14 +302,18 @@ def add_cargo_package(self, package: "Package") -> None:
                 "cmd": "cargo_config",
                 "args": f"--rustargs-file={str(package._parent._kernel.rustargs)} "
                 + f"--target-file={str(package._parent._kernel.rust_target)} "
-                + f"--extra-args=\"" + " ".join(package.build_options) + "\" "
+                + f'--extra-args="'
+                + " ".join(package.build_options)
+                + '" '
                 + f"{str(package.build_dir)}",
                 "description": f"cargo config {package.name}",
             },
             order_only=[f"{dep}_install.stamp" for dep in package.deps],
         )
         self._ninja.newline()
-        self._ninja.build(f"{package.name}_setup", "phony", f"{package.build_dir}/.cargo/config.toml")
+        self._ninja.build(
+            f"{package.name}_setup", "phony", f"{package.build_dir}/.cargo/config.toml"
+        )
         self._ninja.newline()
         self._ninja.build(
             f"{package.name}_compile.stamp",
@@ -339,7 +343,7 @@ def add_cargo_package(self, package: "Package") -> None:
                 "args": f"--suffix=.elf "
                 + f"--target-file={str(package._parent._kernel.rust_target)} "
                 + f"{str(package.build_dir)} "
-                + " ".join((str(t.with_suffix('')) for t in package.installed_targets)),
+                + " ".join((str(t.with_suffix("")) for t in package.installed_targets)),
                 "description": f"cargo install {package.name}",
             },
         )

src/outpost/barbican/package/cargo.py

@@ -71,7 +71,12 @@ def publish(self, *, name: str, version: str, manifest: Path, target_dir: Path)
         crate_index_filepath = self.index / name[:2] / name[2:4] / name
         if crate_index_filepath.exists():
             crate_index_filepath.unlink()
-        self._cargo.package(manifest_path=str(manifest), target_dir=str(target_dir), no_verify=True, allow_dirty=True)
+        self._cargo.package(
+            manifest_path=str(manifest),
+            target_dir=str(target_dir),
+            no_verify=True,
+            allow_dirty=True,
+        )
         self._cargo.index(
             subcmd=["add"],
             crate=str(target_dir / "package" / crate_filename),