diff --git a/devices/org.osbuild.loopback b/devices/org.osbuild.loopback index 807208a1..1b19b924 100755 --- a/devices/org.osbuild.loopback +++ b/devices/org.osbuild.loopback @@ -20,14 +20,11 @@ documentation for `osbuil.util.udev.UdevInhibitor`. import argparse import os import sys - from typing import Dict -from osbuild import devices -from osbuild import loop +from osbuild import devices, loop from osbuild.util.udev import UdevInhibitor - SCHEMA = """ "additionalProperties": false, "required": ["filename"], diff --git a/devices/org.osbuild.luks2 b/devices/org.osbuild.luks2 index 8c44131f..e2f5e55b 100755 --- a/devices/org.osbuild.luks2 +++ b/devices/org.osbuild.luks2 @@ -19,13 +19,11 @@ import stat import subprocess import sys import uuid - from typing import Dict, Optional from osbuild import devices from osbuild.util.udev import UdevInhibitor - SCHEMA = """ "additionalProperties": false, "required": ["passphrase"], diff --git a/devices/org.osbuild.lvm2.lv b/devices/org.osbuild.lvm2.lv index bf153d5e..324c795e 100755 --- a/devices/org.osbuild.lvm2.lv +++ b/devices/org.osbuild.lvm2.lv @@ -34,12 +34,10 @@ import stat import subprocess import sys import time - from typing import Dict, Tuple, Union from osbuild import devices - SCHEMA = """ "additionalProperties": false, "required": ["volume"], diff --git a/inputs/org.osbuild.containers b/inputs/org.osbuild.containers index 7d2f5562..c50006c7 100755 --- a/inputs/org.osbuild.containers +++ b/inputs/org.osbuild.containers @@ -22,7 +22,6 @@ import sys from osbuild import inputs - SCHEMA = r""" "definitions": { "source-options": { diff --git a/inputs/org.osbuild.files b/inputs/org.osbuild.files index a088eac4..08bdf93f 100755 --- a/inputs/org.osbuild.files +++ b/inputs/org.osbuild.files @@ -20,7 +20,6 @@ import sys from osbuild import inputs - SCHEMA = r""" "definitions": { "metadata": { diff --git a/inputs/org.osbuild.ostree b/inputs/org.osbuild.ostree index 326cc701..606d8b27 100755 --- a/inputs/org.osbuild.ostree +++ b/inputs/org.osbuild.ostree @@ -12,14 +12,13 @@ contain `ref` it was specified. """ -import os import json -import sys +import os import subprocess +import sys from osbuild import inputs - SCHEMA = """ "definitions": { "options": { diff --git a/inputs/org.osbuild.ostree.checkout b/inputs/org.osbuild.ostree.checkout index fc90b8fa..8f7b7faa 100755 --- a/inputs/org.osbuild.ostree.checkout +++ b/inputs/org.osbuild.ostree.checkout @@ -8,14 +8,13 @@ Internally uses `ostree checkout` """ -import os import json -import sys +import os import subprocess +import sys from osbuild import inputs - SCHEMA = """ "additionalProperties": false, "required": ["type", "origin", "references"], diff --git a/inputs/org.osbuild.tree b/inputs/org.osbuild.tree index be7945d0..f954f309 100755 --- a/inputs/org.osbuild.tree +++ b/inputs/org.osbuild.tree @@ -12,7 +12,6 @@ import sys from osbuild import inputs - SCHEMA = """ "additionalProperties": false, "required": ["type", "origin", "references"], diff --git a/mounts/org.osbuild.btrfs b/mounts/org.osbuild.btrfs index 7a1ee1c8..cc8bba66 100755 --- a/mounts/org.osbuild.btrfs +++ b/mounts/org.osbuild.btrfs @@ -12,7 +12,6 @@ from typing import Dict from osbuild import mounts - SCHEMA_2 = """ "additionalProperties": false, "required": ["name", "type", "source", "target"], diff --git a/mounts/org.osbuild.ext4 b/mounts/org.osbuild.ext4 index 2fb7624d..5261c9b4 100755 --- a/mounts/org.osbuild.ext4 +++ b/mounts/org.osbuild.ext4 @@ -12,7 +12,6 @@ from typing import Dict from osbuild import mounts - SCHEMA_2 = """ "additionalProperties": false, "required": ["name", "type", "source", "target"], diff --git a/mounts/org.osbuild.fat b/mounts/org.osbuild.fat index 4f40bf04..197ae030 100755 --- a/mounts/org.osbuild.fat +++ b/mounts/org.osbuild.fat @@ -12,7 +12,6 @@ from typing import Dict from osbuild import mounts - SCHEMA_2 = """ "additionalProperties": false, "required": ["name", "type", "source", "target"], diff --git a/mounts/org.osbuild.noop b/mounts/org.osbuild.noop index 7793010c..0dea2814 100755 --- a/mounts/org.osbuild.noop +++ b/mounts/org.osbuild.noop @@ -12,7 +12,6 @@ from typing import Dict from osbuild import mounts - SCHEMA_2 = """ "additionalProperties": false, "required": ["name", "type", "source", "target"], diff --git a/mounts/org.osbuild.ostree.deployment b/mounts/org.osbuild.ostree.deployment index b328ef30..70fcc6eb 100755 --- a/mounts/org.osbuild.ostree.deployment +++ b/mounts/org.osbuild.ostree.deployment @@ -15,14 +15,13 @@ Host commands used: mount """ import os -import sys import subprocess +import sys from typing import Dict from osbuild import mounts from osbuild.util import ostree - SCHEMA_2 = """ "additionalProperties": false, "required": ["name", "type"], diff --git a/mounts/org.osbuild.xfs b/mounts/org.osbuild.xfs index 5529ad6b..9c807591 100755 --- a/mounts/org.osbuild.xfs +++ b/mounts/org.osbuild.xfs @@ -12,7 +12,6 @@ from typing import Dict from osbuild import mounts - SCHEMA_2 = """ "additionalProperties": false, "required": ["name", "type", "source", "target"],