Resolve linter complaints

Author: septatrix

mkosi/__init__.py

@@ -2818,11 +2818,6 @@ def make_oci(context: Context, root_layer: Path, dst: Path) -> None:
         else datetime.datetime.now(tz=datetime.timezone.utc)
     ).isoformat()
 
-    # We could also use the default (which have a space after the punctuation symbol)
-    # but these make it easier to verify the output against other tools (e.g. skopeo)
-    # which often strip the redundant spaces.
-    json_args = {"separators": (",", ":")}
-
     oci_config = {
         "created": creation_time,
         "architecture": context.config.architecture.to_oci(),
@@ -2848,7 +2843,7 @@ def make_oci(context: Context, root_layer: Path, dst: Path) -> None:
             },
         ],
     }
-    oci_config_blob = json.dumps(oci_config, **json_args)
+    oci_config_blob = json.dumps(oci_config)
     oci_config_digest = hashlib.sha256(oci_config_blob.encode()).hexdigest()
     (ca_store / oci_config_digest).write_text(oci_config_blob)
 
@@ -2875,7 +2870,7 @@ def make_oci(context: Context, root_layer: Path, dst: Path) -> None:
             } if context.config.image_version else {}),
         }
     }
-    oci_manifest_blob = json.dumps(oci_manifest, **json_args)
+    oci_manifest_blob = json.dumps(oci_manifest)
     oci_manifest_digest = hashlib.sha256(oci_manifest_blob.encode()).hexdigest()
     (ca_store / oci_manifest_digest).write_text(oci_manifest_blob)
 
@@ -2893,11 +2888,10 @@ def make_oci(context: Context, root_layer: Path, dst: Path) -> None:
                 ],
             },
             f,
-            **json_args
         )
 
     with (dst / "oci-layout").open("w") as f:
-        json.dump({"imageLayoutVersion": "1.0.0"}, f, **json_args)
+        json.dump({"imageLayoutVersion": "1.0.0"}, f)
 
 
 def make_esp(context: Context, uki: Path) -> list[Partition]:
@@ -3188,10 +3182,7 @@ def build_image(context: Context) -> None:
         make_tar(
             context.root, context.staging / "rootfs.layer",
             tools=context.config.tools(),
-            # Make sure tar uses user/group information from the root directory instead of the host.
-            sandbox=context.sandbox(
-                options=["--ro-bind", context.root, context.root, *finalize_passwd_mounts(context.root)],
-            ),
+            sandbox=context.sandbox,
             # We do not want SELinux xattrs in OCI layers
             # as they seldom make sense inside containers.
             options=["--xattrs-exclude", "security.selinux"],

mkosi/archive.py

@@ -1,11 +1,10 @@
 # SPDX-License-Identifier: LGPL-2.1+
 
 import os
-from collections.abc import Iterable
+from collections.abc import Iterable, Sequence
 from pathlib import Path
-from typing import Optional, Sequence
+from typing import Optional
 
-from mkosi.config import __version__
 from mkosi.log import log_step
 from mkosi.run import find_binary, run
 from mkosi.sandbox import SandboxProtocol, finalize_passwd_mounts, nosandbox