osbuild: run isort on all files

.git-blame-ignore-revs

@@ -1 +1 @@
-1be3f1bfb671fa6d59dcd2203f23e1625194574b
+c3385b6562b83e2cfc5cf93d5eddcb38e8eba02e

assemblers/org.osbuild.error

@@ -11,7 +11,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "properties": {

assemblers/org.osbuild.noop

@@ -12,7 +12,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false
 """

assemblers/org.osbuild.oci-archive

@@ -30,7 +30,6 @@ import tempfile
 
 import osbuild.api
 
-
 DEFAULT_PATH = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
 

assemblers/org.osbuild.ostree.commit

@@ -28,7 +28,6 @@ import tempfile
 from osbuild import api
 from osbuild.util import ostree
 
-
 CAPABILITIES = ["CAP_MAC_ADMIN", "CAP_NET_ADMIN", "CAP_SYS_PTRACE"]
 
 

assemblers/org.osbuild.qemu

@@ -28,12 +28,11 @@ import struct
 import subprocess
 import sys
 import tempfile
-from typing import List, BinaryIO, Optional
+from typing import BinaryIO, List, Optional
 
 import osbuild.api
 import osbuild.remoteloop as remoteloop
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["format", "filename", "ptuuid", "size"],

assemblers/org.osbuild.rawfs

@@ -28,7 +28,6 @@ import sys
 import osbuild.api
 import osbuild.remoteloop as remoteloop
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["filename", "root_fs_uuid", "size"],

assemblers/org.osbuild.tar

@@ -26,7 +26,6 @@ import sys
 
 import osbuild.api
 
-
 CAPABILITIES = ["CAP_MAC_ADMIN"]
 
 

osbuild/__init__.py

@@ -10,7 +10,6 @@ independent of osbuild but used across the osbuild codebase.
 
 from .pipeline import Manifest, Pipeline, Stage
 
-
 __version__ = "67"
 
 __all__ = [

osbuild/__main__.py

@@ -8,7 +8,6 @@ import sys
 
 from osbuild.main_cli import osbuild_cli as main
 
-
 if __name__ == "__main__":
     r = main()
     sys.exit(r)

osbuild/api.py

@@ -6,12 +6,12 @@ import json
 import os
 import sys
 import tempfile
-import traceback
 import threading
+import traceback
 from typing import Dict, Optional
-from .util.types import PathLike
-from .util import jsoncomm
 
+from .util import jsoncomm
+from .util.types import PathLike
 
 __all__ = [
     "API"

osbuild/buildroot.py

@@ -15,13 +15,11 @@ import stat
 import subprocess
 import tempfile
 import time
-
 from typing import Optional, Set
 
 from osbuild.api import BaseAPI
 from osbuild.util import linux
 
-
 __all__ = [
     "BuildRoot",
 ]

osbuild/devices.py

@@ -16,8 +16,7 @@ import abc
 import hashlib
 import json
 import os
-
+from typing import Any, Dict, Optional
-from typing import Dict, Optional, Any
 
 from osbuild import host
 

osbuild/formats/v1.py

@@ -7,10 +7,11 @@ the created tree into an artefact. The pipeline can have any
 number of nested build pipelines. A sources section is used
 to fetch resources.
 """
-from typing import Dict, Any
+from typing import Any, Dict
-from osbuild.meta import Index, ValidationResult
-from ..pipeline import BuildResult, Manifest, Pipeline, detect_host_runner
 
+from osbuild.meta import Index, ValidationResult
+
+from ..pipeline import BuildResult, Manifest, Pipeline, detect_host_runner
 
 VERSION = "1"
 

osbuild/formats/v2.py

@@ -2,13 +2,14 @@
 
 Second, and current, version of the manifest description
 """
-from typing import Dict, Any
+from typing import Any, Dict
+
 from osbuild.meta import Index, ModuleInfo, ValidationResult
+
 from ..inputs import Input
 from ..pipeline import Manifest, Pipeline, Stage, detect_host_runner
 from ..sources import Source
 
-
 VERSION = "2"
 
 

osbuild/host.py

@@ -48,7 +48,7 @@ import sys
 import threading
 import traceback
 from collections import OrderedDict
-from typing import Any, Dict, List, Optional, Tuple, Callable, Iterable, Union
+from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, Union
 
 from osbuild.util.jsoncomm import FdSet, Socket
 

osbuild/inputs.py

@@ -20,11 +20,11 @@ import abc
 import hashlib
 import json
 import os
-
+from typing import Any, Dict, Optional, Tuple
-from typing import Dict, Optional, Tuple, Any
 
 from osbuild import host
 from osbuild.util.types import PathLike
+
 from .objectstore import StoreClient, StoreServer
 
 

osbuild/meta.py

@@ -24,16 +24,16 @@ import ast
 import contextlib
 import copy
 import importlib.util
+import json
 import os
 import pkgutil
-import json
 import sys
 from collections import deque
-from typing import Dict, Sequence, List, Optional, Union, Set, Deque, Any, Tuple
+from typing import (Any, Deque, Dict, List, Optional, Sequence, Set, Tuple,
+                    Union)
 
 import jsonschema
 
-
 FAILED_TITLE = "JSON Schema validation failed"
 FAILED_TYPEURI = "https://osbuild.org/validation-error"
 

osbuild/monitor.py

@@ -13,7 +13,6 @@ import json
 import os
 import sys
 import time
-
 from typing import Dict
 
 import osbuild

osbuild/mounts.py

@@ -12,7 +12,6 @@ import hashlib
 import json
 import os
 import subprocess
-
 from typing import Dict, List
 
 from osbuild import host

osbuild/objectstore.py

@@ -3,13 +3,13 @@ import os
 import subprocess
 import tempfile
 import uuid
-from typing import Optional, Iterator, Set
+from typing import Iterator, Optional, Set
 
-from osbuild.util.types import PathLike
 from osbuild.util import jsoncomm, rmrf
 from osbuild.util.mnt import mount, umount
-from . import api
+from osbuild.util.types import PathLike
 
+from . import api
 
 __all__ = [
     "ObjectStore",

osbuild/pipeline.py

@@ -5,18 +5,14 @@ import json
 import os
 from typing import Dict, Generator, Iterable, Iterator, List, Optional
 
+from . import buildroot, host, objectstore, remoteloop
 from .api import API
-from . import buildroot
-from . import host
-from . import objectstore
-from . import remoteloop
 from .devices import Device, DeviceManager
 from .inputs import Input, InputManager
 from .mounts import Mount, MountManager
+from .objectstore import ObjectStore
 from .sources import Source
 from .util import osrelease
-from .objectstore import ObjectStore
-
 
 DEFAULT_CAPABILITIES = {
     "CAP_AUDIT_WRITE",

osbuild/remoteloop.py

@@ -1,8 +1,8 @@
 import contextlib
 import errno
 import os
-from . import api
+
-from . import loop
+from . import api, loop
 from .util import jsoncomm
 
 __all__ = [

osbuild/sources.py

@@ -1,9 +1,9 @@
 import abc
-import contextlib
-import os
-import json
-import tempfile
 import concurrent.futures
+import contextlib
+import json
+import os
+import tempfile
 from abc import abstractmethod
 from typing import Dict, Tuple
 

osbuild/util/checksum.py

@@ -7,7 +7,6 @@ import os
 
 from .types import PathLike
 
-
 # How many bytes to read in one go. Taken from coreutils/gnulib
 BLOCKSIZE = 32768
 

osbuild/util/ctx.py

@@ -7,7 +7,6 @@ library.
 
 import contextlib
 
-
 __all__ = [
     "suppress_oserror",
 ]

osbuild/util/jsoncomm.py

@@ -12,8 +12,8 @@ import errno
 import json
 import os
 import socket
-from typing import Any
+from typing import Any, Optional
-from typing import Optional
+
 from .types import PathLike
 
 

osbuild/util/linux.py

@@ -20,7 +20,6 @@ import os
 import platform
 import threading
 
-
 __all__ = [
     "ioctl_get_immutable",
     "ioctl_toggle_immutable",

osbuild/util/lorax.py

@@ -15,8 +15,7 @@ import re
 import shlex
 import shutil
 import subprocess
-
+from typing import Any, Dict
-from typing import Dict, Any
 
 import mako.template
 

osbuild/util/lvm2.py

@@ -26,9 +26,8 @@ import os
 import re
 import struct
 import sys
-
 from collections import OrderedDict
-from typing import BinaryIO, Dict, Union, List
+from typing import BinaryIO, Dict, List, Union
 
 PathLike = Union[str, bytes, os.PathLike]
 

osbuild/util/osrelease.py

@@ -6,7 +6,6 @@ related documentation can be found in `os-release(5)`.
 
 import os
 
-
 # The default paths where os-release is located, as per os-release(5)
 DEFAULT_PATHS = [
     "/etc/os-release",

osbuild/util/ostree.py

@@ -6,8 +6,7 @@ import subprocess
 import sys
 import tempfile
 import typing
-
+from typing import Any, List
-from typing import List, Any
 
 from .types import PathLike
 

osbuild/util/rmrf.py

@@ -16,7 +16,6 @@ import shutil
 
 import osbuild.util.linux as linux
 
-
 __all__ = [
     "rmtree",
 ]

osbuild/util/selinux.py

@@ -3,7 +3,6 @@
 import errno
 import os
 import subprocess
-
 from typing import Dict, TextIO
 
 # Extended attribute name for SELinux labels

osbuild/util/term.py

@@ -1,7 +1,6 @@
 """Wrapper module for output formatting."""
 
 import sys
-
 from typing import Dict
 
 

osbuild/util/udev.py

@@ -3,7 +3,6 @@
 import contextlib
 import pathlib
 
-
 # The default lock dir to use
 LOCKDIR = "/run/osbuild/locks/udev"
 

runners/org.osbuild.linux

@@ -3,7 +3,6 @@
 import subprocess
 import sys
 
-
 if __name__ == "__main__":
     r = subprocess.run(sys.argv[1:], check=False)
     sys.exit(r.returncode)

sources/org.osbuild.curl

@@ -20,11 +20,9 @@ import tempfile
 import urllib.parse
 
 from osbuild import sources
-
 from osbuild.util.checksum import verify_file
 from osbuild.util.rhsm import Subscriptions
 
-
 SCHEMA = """
 "additionalProperties": false,
 "definitions": {

sources/org.osbuild.inline

@@ -19,7 +19,6 @@ import sys
 from osbuild import sources
 from osbuild.util.checksum import verify_file
 
-
 SCHEMA = """
 "definitions": {
   "item": {

sources/org.osbuild.ostree

@@ -8,13 +8,12 @@ gpg keys are provided via `gpgkeys`.
 
 
 import os
-import sys
 import subprocess
+import sys
 import uuid
-from osbuild.util.ostree import show
 
 from osbuild import sources
-
+from osbuild.util.ostree import show
 
 SCHEMA = """
 "additionalProperties": false,

sources/org.osbuild.skopeo

@@ -5,11 +5,11 @@ Buildhost commands used: `skopeo`.
 """
 
 import errno
-import os
-import sys
-import subprocess
-import tempfile
 import hashlib
+import os
+import subprocess
+import sys
+import tempfile
 
 from osbuild import sources
 from osbuild.util import ctx

stages/org.osbuild.anaconda

@@ -12,10 +12,8 @@ configurable via the `kickstart-modules` option.
 import os
 import sys
 
-
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": true,
 "required": ["kickstart-modules"],

stages/org.osbuild.authconfig

@@ -16,7 +16,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "description": "Configure authentication sources."

stages/org.osbuild.authselect

@@ -20,7 +20,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["profile"],

stages/org.osbuild.bootiso.mono

@@ -30,10 +30,9 @@ import shutil
 import subprocess
 import sys
 import tempfile
-import osbuild.remoteloop as remoteloop
 
 import osbuild.api
-
+import osbuild.remoteloop as remoteloop
 
 SCHEMA_2 = """
 "options": {

stages/org.osbuild.buildstamp

@@ -11,7 +11,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": true,
 "required": ["arch", "product", "version", "final"],

stages/org.osbuild.chrony

@@ -35,12 +35,11 @@ Constraints:
 """
 
 
-import sys
 import re
+import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "oneOf": [

stages/org.osbuild.clevis.luks-bind

@@ -10,10 +10,8 @@ import os
 import subprocess
 import sys
 
-
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "devices": {
   "type": "object",

stages/org.osbuild.cloud-init

@@ -17,12 +17,11 @@ Currently supported subset of cloud-init configuration:
 
 
 import sys
+
 import yaml
 
-
 import osbuild.api
 
-
 SCHEMA = r"""
 "definitions": {
   "reporting_handlers": {

stages/org.osbuild.containers.storage.conf

@@ -17,10 +17,8 @@ try:
 except ModuleNotFoundError:
     import pytoml as toml
 
-
 import osbuild.api
 
-
 SCHEMA = r"""
 "definitions": {
   "storage": {

stages/org.osbuild.copy

@@ -14,13 +14,11 @@ the directory itself.
 import os
 import subprocess
 import sys
-
 from typing import Dict
-from urllib.parse import urlparse, ParseResult
+from urllib.parse import ParseResult, urlparse
 
 import osbuild.api
 
-
 CAPABILITIES = ["CAP_MAC_ADMIN"]
 
 

stages/org.osbuild.cron.script

@@ -17,7 +17,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "options": {
   "additionalProperties": false,

stages/org.osbuild.crypttab

@@ -18,7 +18,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["volumes"],

stages/org.osbuild.debug-shell

@@ -14,7 +14,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["tty"],

stages/org.osbuild.discinfo

@@ -6,12 +6,11 @@ This will create a `.discinfo` file with the specified parameters.
 """
 
 import os
-import time
 import sys
+import time
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": true,
 "required": ["basearch", "release"],

stages/org.osbuild.dnf-automatic.config

@@ -11,11 +11,11 @@ a subset of options can be set:
 
 
 import sys
+
 import iniparse
 
 import osbuild.api
 
-
 SCHEMA = r"""
 "definitions": {
   "commands": {

stages/org.osbuild.dnf.config

@@ -12,11 +12,11 @@ for details about the configuration options.
 
 import os
 import sys
+
 import iniparse
 
 import osbuild.api
 
-
 SCHEMA = r"""
 "definitions": {
   "variable": {

stages/org.osbuild.dracut

@@ -17,7 +17,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "required": ["kernel"],
 "properties": {

stages/org.osbuild.dracut.conf

@@ -28,7 +28,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = r"""
 "additionalProperties": false,
 "required": ["config", "filename"],

stages/org.osbuild.error

@@ -11,7 +11,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "properties": {

stages/org.osbuild.fdo

@@ -7,13 +7,12 @@ This will create a '/fdo_diun_root_certs.pem' with content
 specified via the `rootcerts` input.
 """
 
-import shutil
 import os
+import shutil
 import sys
 
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "inputs": {
   "type": "object",

stages/org.osbuild.firewall

@@ -31,7 +31,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "properties": {

stages/org.osbuild.first-boot

@@ -21,7 +21,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["commands"],

stages/org.osbuild.fix-bls

@@ -24,7 +24,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "properties": {

stages/org.osbuild.fstab

@@ -17,7 +17,6 @@ import sys
 import osbuild.api
 from osbuild.util import ostree
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["filesystems"],

stages/org.osbuild.gcp.guest-agent.conf

@@ -18,7 +18,6 @@ import iniparse
 
 import osbuild.api
 
-
 SCHEMA = r"""
 "definitions": {
   "Accounts": {

stages/org.osbuild.greenboot

@@ -10,7 +10,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["config"],

stages/org.osbuild.groups

@@ -16,7 +16,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "properties": {

stages/org.osbuild.grub2

@@ -82,7 +82,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "oneOf": [{

stages/org.osbuild.grub2.inst

@@ -42,16 +42,14 @@ image and transfers control to it.
 
 
 import os
-import subprocess
 import shutil
 import struct
+import subprocess
 import sys
-
 from typing import BinaryIO, Dict
 
 import osbuild.api
 
-
 SCHEMA = r"""
 "definitions": {
     "core-mkimage": {

stages/org.osbuild.grub2.iso

@@ -7,10 +7,10 @@ an efiboot.img.
 
 import os
 import shutil
-import sys
 import string
-import osbuild.api
+import sys
 
+import osbuild.api
 
 SCHEMA_2 = """
 "options": {

stages/org.osbuild.grub2.legacy

@@ -45,7 +45,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 
 "definitions": {

stages/org.osbuild.gunzip

@@ -11,7 +11,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "inputs": {
   "type": "object",

stages/org.osbuild.gzip

@@ -11,7 +11,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "inputs": {
   "type": "object",

stages/org.osbuild.hostname

@@ -16,7 +16,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["hostname"],

stages/org.osbuild.ignition

@@ -21,7 +21,6 @@ import sys
 
 import osbuild.api
 
-
 STAGE_OPTS = """
 "properties": {
   "network": {

stages/org.osbuild.implantisomd5

@@ -12,7 +12,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["filename"],

stages/org.osbuild.isolinux

@@ -6,10 +6,10 @@ Create an isolinux bootloader
 
 import os
 import shutil
-import sys
 import string
-import osbuild.api
+import sys
 
+import osbuild.api
 
 SCHEMA_2 = """
 "options": {

stages/org.osbuild.kernel-cmdline

@@ -14,7 +14,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "properties": {

stages/org.osbuild.keymap

@@ -18,13 +18,12 @@ Valid keymaps are generally found in /lib/kbd/keymaps.
 """
 
 
+import os
 import subprocess
 import sys
-import os
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["keymap"],

stages/org.osbuild.kickstart

@@ -10,14 +10,12 @@ Only a very limited set of available kickstart
 commands are supported here.
 """
 
-import sys
 import os
-
+import sys
 from typing import Dict, List
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["path"],

stages/org.osbuild.locale

@@ -11,13 +11,12 @@ target system with `LANG={language}`.
 """
 
 
+import os
 import subprocess
 import sys
-import os
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["language"],

stages/org.osbuild.lorax-script

@@ -20,10 +20,8 @@ import collections
 import os
 import sys
 
-from osbuild.util.lorax import render_template, Script
-
 import osbuild.api
-
+from osbuild.util.lorax import Script, render_template
 
 SCHEMA = """
 "additionalProperties": false,

stages/org.osbuild.luks2.format

@@ -17,10 +17,8 @@ import os
 import subprocess
 import sys
 
-
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "definitions": {
   "pbkdf2": {

stages/org.osbuild.luks2.remove-key

@@ -10,10 +10,8 @@ import os
 import subprocess
 import sys
 
-
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "devices": {
   "type": "object",

stages/org.osbuild.lvm2.create

@@ -15,10 +15,8 @@ import subprocess
 import sys
 import uuid
 
-
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "devices": {
   "type": "object",

stages/org.osbuild.mkdir

@@ -12,7 +12,6 @@ import sys
 import osbuild.api
 from osbuild.util.path import in_tree
 
-
 SCHEMA_2 = r"""
 "options": {
   "additionalProperties": false,

stages/org.osbuild.mkfs.btrfs

@@ -11,10 +11,8 @@ Buildhost commands used: `mkfs.btrfs`.
 import subprocess
 import sys
 
-
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "devices": {
   "type": "object",

stages/org.osbuild.mkfs.ext4

@@ -11,10 +11,8 @@ Buildhost commands used: `mke2fs`.
 import subprocess
 import sys
 
-
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "devices": {
   "type": "object",

stages/org.osbuild.mkfs.fat

@@ -15,10 +15,8 @@ Buildhost commands used: `mkfs.fat`.
 import subprocess
 import sys
 
-
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "devices": {
   "type": "object",

stages/org.osbuild.mkfs.xfs

@@ -11,10 +11,8 @@ Buildhost commands used: `mkfs.xfs`.
 import subprocess
 import sys
 
-
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "devices": {
   "type": "object",

stages/org.osbuild.modprobe

@@ -22,7 +22,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = r"""
 "additionalProperties": false,
 "required": ["commands", "filename"],

stages/org.osbuild.nm.conf

@@ -25,7 +25,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = r"""
 "definitions": {
   "device-list": {

stages/org.osbuild.nm.conn

@@ -13,13 +13,12 @@ and here only a subset of the available options. See the schema
 for more information.
 """
 
+import configparser
 import os
 import sys
-import configparser
 
 import osbuild.api
 
-
 SCHEMA = r"""
 "definitions": {
   "connection": {

stages/org.osbuild.noop

@@ -12,7 +12,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA_2 = """
 "options": {
   "additionalProperties": true

stages/org.osbuild.oci-archive

@@ -38,16 +38,15 @@ podman[3] with `podman pull oci-archive:<archive>`.
 
 
 import datetime
-import time
 import json
 import os
 import subprocess
 import sys
 import tempfile
+import time
 
 import osbuild.api
 
-
 DEFAULT_PATH = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
 

stages/org.osbuild.oscap.remediation

@@ -19,7 +19,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["config"],

stages/org.osbuild.ostree

@@ -22,8 +22,8 @@ the sysroot and the deployments. Additional kernel options can be passed via
 
 
 import os
-import sys
 import subprocess
+import sys
 
 import osbuild.api
 from osbuild.util import selinux

stages/org.osbuild.ostree.commit

@@ -23,7 +23,6 @@ import tempfile
 from osbuild import api
 from osbuild.util import ostree
 
-
 CAPABILITIES = ["CAP_MAC_ADMIN", "CAP_NET_ADMIN", "CAP_SYS_PTRACE"]
 
 

stages/org.osbuild.ostree.config

@@ -11,12 +11,11 @@ See `ostree.repo-config(5)` for more information.
 """
 
 import os
-import sys
 import subprocess
+import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["repo"],