ci: Refresh generated files

Add black, drop scrub. Signed-off-by: Andrea Bolognani <abologna@redhat.com> Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
2024-12-22 05:35:25 +00:00 · 2023-11-30 19:31:57 +01:00 · 2023-11-30 19:31:57 +01:00 · 417bd41cba
commit 417bd41cba
parent dca48ec74c
88 changed files with 118 additions and 86 deletions
--- a/ci/buildenv/almalinux-8.sh
+++ b/ci/buildenv/almalinux-8.sh
@ -73,12 +73,14 @@ function install_buildenv() {
        python3 \
        python3-docutils \
        python3-flake8 \
+        python3-pip \
        python3-pytest \
+        python3-setuptools \
+        python3-wheel \
        qemu-img \
        readline-devel \
        rpm-build \
        sanlock-devel \
-        scrub \
        sed \
        systemd-devel \
        systemd-rpm-macros \
@ -90,6 +92,7 @@ function install_buildenv() {
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
+    /usr/bin/pip3 install black
 }

 export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
--- a/ci/buildenv/alpine-317.sh
+++ b/ci/buildenv/alpine-317.sh
@ -13,6 +13,7 @@ function install_buildenv() {
        audit-dev \
        augeas \
        bash-completion \
+        black \
        ca-certificates \
        ccache \
        ceph-dev \
--- a/ci/buildenv/alpine-edge.sh
+++ b/ci/buildenv/alpine-edge.sh
@ -13,6 +13,7 @@ function install_buildenv() {
        audit-dev \
        augeas \
        bash-completion \
+        black \
        ca-certificates \
        ccache \
        ceph-dev \
--- a/ci/buildenv/centos-stream-8.sh
+++ b/ci/buildenv/centos-stream-8.sh
@ -74,12 +74,14 @@ function install_buildenv() {
        python3 \
        python3-docutils \
        python3-flake8 \
+        python3-pip \
        python3-pytest \
+        python3-setuptools \
+        python3-wheel \
        qemu-img \
        readline-devel \
        rpm-build \
        sanlock-devel \
-        scrub \
        sed \
        systemd-devel \
        systemd-rpm-macros \
@ -91,6 +93,7 @@ function install_buildenv() {
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
+    /usr/bin/pip3 install black
 }

 export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
--- a/ci/buildenv/centos-stream-9.sh
+++ b/ci/buildenv/centos-stream-9.sh
@ -70,12 +70,14 @@ function install_buildenv() {
        python3 \
        python3-docutils \
        python3-flake8 \
+        python3-pip \
        python3-pytest \
+        python3-setuptools \
+        python3-wheel \
        qemu-img \
        readline-devel \
        rpm-build \
        sanlock-devel \
-        scrub \
        sed \
        systemd-devel \
        systemd-rpm-macros \
@ -87,6 +89,7 @@ function install_buildenv() {
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
+    /usr/bin/pip3 install black
 }

 export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
--- a/ci/buildenv/debian-11-cross-aarch64.sh
+++ b/ci/buildenv/debian-11-cross-aarch64.sh
@ -12,6 +12,7 @@ function install_buildenv() {
            augeas-lenses \
            augeas-tools \
            bash-completion \
+            black \
            ca-certificates \
            ccache \
            codespell \
@ -42,7 +43,6 @@ function install_buildenv() {
            python3-docutils \
            python3-pytest \
            qemu-utils \
-            scrub \
            sed \
            xsltproc
    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
--- a/ci/buildenv/debian-11-cross-armv6l.sh
+++ b/ci/buildenv/debian-11-cross-armv6l.sh
@ -12,6 +12,7 @@ function install_buildenv() {
            augeas-lenses \
            augeas-tools \
            bash-completion \
+            black \
            ca-certificates \
            ccache \
            codespell \
@ -42,7 +43,6 @@ function install_buildenv() {
            python3-docutils \
            python3-pytest \
            qemu-utils \
-            scrub \
            sed \
            xsltproc
    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
--- a/ci/buildenv/debian-11-cross-armv7l.sh
+++ b/ci/buildenv/debian-11-cross-armv7l.sh
@ -12,6 +12,7 @@ function install_buildenv() {
            augeas-lenses \
            augeas-tools \
            bash-completion \
+            black \
            ca-certificates \
            ccache \
            codespell \
@ -42,7 +43,6 @@ function install_buildenv() {
            python3-docutils \
            python3-pytest \
            qemu-utils \
-            scrub \
            sed \
            xsltproc
    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
--- a/ci/buildenv/debian-11-cross-i686.sh
+++ b/ci/buildenv/debian-11-cross-i686.sh
@ -12,6 +12,7 @@ function install_buildenv() {
            augeas-lenses \
            augeas-tools \
            bash-completion \
+            black \
            ca-certificates \
            ccache \
            codespell \
@ -42,7 +43,6 @@ function install_buildenv() {
            python3-docutils \
            python3-pytest \
            qemu-utils \
-            scrub \
            sed \
            xsltproc
    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
--- a/ci/buildenv/debian-11-cross-mips64el.sh
+++ b/ci/buildenv/debian-11-cross-mips64el.sh
@ -12,6 +12,7 @@ function install_buildenv() {
            augeas-lenses \
            augeas-tools \
            bash-completion \
+            black \
            ca-certificates \
            ccache \
            codespell \
@ -42,7 +43,6 @@ function install_buildenv() {
            python3-docutils \
            python3-pytest \
            qemu-utils \
-            scrub \
            sed \
            xsltproc
    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
--- a/ci/buildenv/debian-11-cross-mipsel.sh
+++ b/ci/buildenv/debian-11-cross-mipsel.sh
@ -12,6 +12,7 @@ function install_buildenv() {
            augeas-lenses \
            augeas-tools \
            bash-completion \
+            black \
            ca-certificates \
            ccache \
            codespell \
@ -42,7 +43,6 @@ function install_buildenv() {
            python3-docutils \
            python3-pytest \
            qemu-utils \
-            scrub \
            sed \
            xsltproc
    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
--- a/ci/buildenv/debian-11-cross-ppc64le.sh
+++ b/ci/buildenv/debian-11-cross-ppc64le.sh
@ -12,6 +12,7 @@ function install_buildenv() {
            augeas-lenses \
            augeas-tools \
            bash-completion \
+            black \
            ca-certificates \
            ccache \
            codespell \
@ -42,7 +43,6 @@ function install_buildenv() {
            python3-docutils \
            python3-pytest \
            qemu-utils \
-            scrub \
            sed \
            xsltproc
    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
--- a/ci/buildenv/debian-11-cross-s390x.sh
+++ b/ci/buildenv/debian-11-cross-s390x.sh
@ -12,6 +12,7 @@ function install_buildenv() {
            augeas-lenses \
            augeas-tools \
            bash-completion \
+            black \
            ca-certificates \
            ccache \
            codespell \
@ -42,7 +43,6 @@ function install_buildenv() {
            python3-docutils \
            python3-pytest \
            qemu-utils \
-            scrub \
            sed \
            xsltproc
    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
--- a/ci/buildenv/debian-11.sh
+++ b/ci/buildenv/debian-11.sh
@ -12,6 +12,7 @@ function install_buildenv() {
            augeas-lenses \
            augeas-tools \
            bash-completion \
+            black \
            ca-certificates \
            ccache \
            clang \
@ -77,7 +78,6 @@ function install_buildenv() {
            python3-docutils \
            python3-pytest \
            qemu-utils \
-            scrub \
            sed \
            systemtap-sdt-dev \
            wireshark-dev \
--- a/ci/buildenv/debian-12-cross-aarch64.sh
+++ b/ci/buildenv/debian-12-cross-aarch64.sh
@ -12,6 +12,7 @@ function install_buildenv() {
            augeas-lenses \
            augeas-tools \
            bash-completion \
+            black \
            ca-certificates \
            ccache \
            codespell \
@ -43,7 +44,6 @@ function install_buildenv() {
            python3-docutils \
            python3-pytest \
            qemu-utils \
-            scrub \
            sed \
            xsltproc
    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
--- a/ci/buildenv/debian-12-cross-armv6l.sh
+++ b/ci/buildenv/debian-12-cross-armv6l.sh
@ -12,6 +12,7 @@ function install_buildenv() {
            augeas-lenses \
            augeas-tools \
            bash-completion \
+            black \
            ca-certificates \
            ccache \
            codespell \
@ -43,7 +44,6 @@ function install_buildenv() {
            python3-docutils \
            python3-pytest \
            qemu-utils \
-            scrub \
            sed \
            xsltproc
    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
--- a/ci/buildenv/debian-12-cross-armv7l.sh
+++ b/ci/buildenv/debian-12-cross-armv7l.sh
@ -12,6 +12,7 @@ function install_buildenv() {
            augeas-lenses \
            augeas-tools \
            bash-completion \
+            black \
            ca-certificates \
            ccache \
            codespell \
@ -43,7 +44,6 @@ function install_buildenv() {
            python3-docutils \
            python3-pytest \
            qemu-utils \
-            scrub \
            sed \
            xsltproc
    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
--- a/ci/buildenv/debian-12-cross-i686.sh
+++ b/ci/buildenv/debian-12-cross-i686.sh
@ -12,6 +12,7 @@ function install_buildenv() {
            augeas-lenses \
            augeas-tools \
            bash-completion \
+            black \
            ca-certificates \
            ccache \
            codespell \
@ -43,7 +44,6 @@ function install_buildenv() {
            python3-docutils \
            python3-pytest \
            qemu-utils \
-            scrub \
            sed \
            xsltproc
    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
--- a/ci/buildenv/debian-12-cross-mips64el.sh
+++ b/ci/buildenv/debian-12-cross-mips64el.sh
@ -12,6 +12,7 @@ function install_buildenv() {
            augeas-lenses \
            augeas-tools \
            bash-completion \
+            black \
            ca-certificates \
            ccache \
            codespell \
@ -43,7 +44,6 @@ function install_buildenv() {
            python3-docutils \
            python3-pytest \
            qemu-utils \
-            scrub \
            sed \
            xsltproc
    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
--- a/ci/buildenv/debian-12-cross-mipsel.sh
+++ b/ci/buildenv/debian-12-cross-mipsel.sh
@ -12,6 +12,7 @@ function install_buildenv() {
            augeas-lenses \
            augeas-tools \
            bash-completion \
+            black \
            ca-certificates \
            ccache \
            codespell \
@ -43,7 +44,6 @@ function install_buildenv() {
            python3-docutils \
            python3-pytest \
            qemu-utils \
-            scrub \
            sed \
            xsltproc
    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
--- a/ci/buildenv/debian-12-cross-ppc64le.sh
+++ b/ci/buildenv/debian-12-cross-ppc64le.sh
@ -12,6 +12,7 @@ function install_buildenv() {
            augeas-lenses \
            augeas-tools \
            bash-completion \
+            black \
            ca-certificates \
            ccache \
            codespell \
@ -43,7 +44,6 @@ function install_buildenv() {
            python3-docutils \
            python3-pytest \
            qemu-utils \
-            scrub \
            sed \
            xsltproc
    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
--- a/ci/buildenv/debian-12-cross-s390x.sh
+++ b/ci/buildenv/debian-12-cross-s390x.sh
@ -12,6 +12,7 @@ function install_buildenv() {
            augeas-lenses \
            augeas-tools \
            bash-completion \
+            black \
            ca-certificates \
            ccache \
            codespell \
@ -43,7 +44,6 @@ function install_buildenv() {
            python3-docutils \
            python3-pytest \
            qemu-utils \
-            scrub \
            sed \
            xsltproc
    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
--- a/ci/buildenv/debian-12.sh
+++ b/ci/buildenv/debian-12.sh
@ -12,6 +12,7 @@ function install_buildenv() {
            augeas-lenses \
            augeas-tools \
            bash-completion \
+            black \
            ca-certificates \
            ccache \
            clang \
@ -77,7 +78,6 @@ function install_buildenv() {
            python3-docutils \
            python3-pytest \
            qemu-utils \
-            scrub \
            sed \
            systemtap-sdt-dev \
            wireshark-dev \
--- a/ci/buildenv/debian-sid-cross-aarch64.sh
+++ b/ci/buildenv/debian-sid-cross-aarch64.sh
@ -12,6 +12,7 @@ function install_buildenv() {
            augeas-lenses \
            augeas-tools \
            bash-completion \
+            black \
            ca-certificates \
            ccache \
            codespell \
@ -43,7 +44,6 @@ function install_buildenv() {
            python3-docutils \
            python3-pytest \
            qemu-utils \
-            scrub \
            sed \
            xsltproc
    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
--- a/ci/buildenv/debian-sid-cross-armv6l.sh
+++ b/ci/buildenv/debian-sid-cross-armv6l.sh
@ -12,6 +12,7 @@ function install_buildenv() {
            augeas-lenses \
            augeas-tools \
            bash-completion \
+            black \
            ca-certificates \
            ccache \
            codespell \
@ -43,7 +44,6 @@ function install_buildenv() {
            python3-docutils \
            python3-pytest \
            qemu-utils \
-            scrub \
            sed \
            xsltproc
    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
--- a/ci/buildenv/debian-sid-cross-armv7l.sh
+++ b/ci/buildenv/debian-sid-cross-armv7l.sh
@ -12,6 +12,7 @@ function install_buildenv() {
            augeas-lenses \
            augeas-tools \
            bash-completion \
+            black \
            ca-certificates \
            ccache \
            codespell \
@ -43,7 +44,6 @@ function install_buildenv() {
            python3-docutils \
            python3-pytest \
            qemu-utils \
-            scrub \
            sed \
            xsltproc
    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
--- a/ci/buildenv/debian-sid-cross-i686.sh
+++ b/ci/buildenv/debian-sid-cross-i686.sh
@ -12,6 +12,7 @@ function install_buildenv() {
            augeas-lenses \
            augeas-tools \
            bash-completion \
+            black \
            ca-certificates \
            ccache \
            codespell \
@ -43,7 +44,6 @@ function install_buildenv() {
            python3-docutils \
            python3-pytest \
            qemu-utils \
-            scrub \
            sed \
            xsltproc
    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
--- a/ci/buildenv/debian-sid-cross-mips64el.sh
+++ b/ci/buildenv/debian-sid-cross-mips64el.sh
@ -12,6 +12,7 @@ function install_buildenv() {
            augeas-lenses \
            augeas-tools \
            bash-completion \
+            black \
            ca-certificates \
            ccache \
            codespell \
@ -43,7 +44,6 @@ function install_buildenv() {
            python3-docutils \
            python3-pytest \
            qemu-utils \
-            scrub \
            sed \
            xsltproc
    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
--- a/ci/buildenv/debian-sid-cross-ppc64le.sh
+++ b/ci/buildenv/debian-sid-cross-ppc64le.sh
@ -12,6 +12,7 @@ function install_buildenv() {
            augeas-lenses \
            augeas-tools \
            bash-completion \
+            black \
            ca-certificates \
            ccache \
            codespell \
@ -43,7 +44,6 @@ function install_buildenv() {
            python3-docutils \
            python3-pytest \
            qemu-utils \
-            scrub \
            sed \
            xsltproc
    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
--- a/ci/buildenv/debian-sid-cross-s390x.sh
+++ b/ci/buildenv/debian-sid-cross-s390x.sh
@ -12,6 +12,7 @@ function install_buildenv() {
            augeas-lenses \
            augeas-tools \
            bash-completion \
+            black \
            ca-certificates \
            ccache \
            codespell \
@ -43,7 +44,6 @@ function install_buildenv() {
            python3-docutils \
            python3-pytest \
            qemu-utils \
-            scrub \
            sed \
            xsltproc
    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
--- a/ci/buildenv/debian-sid.sh
+++ b/ci/buildenv/debian-sid.sh
@ -12,6 +12,7 @@ function install_buildenv() {
            augeas-lenses \
            augeas-tools \
            bash-completion \
+            black \
            ca-certificates \
            ccache \
            clang \
@ -77,7 +78,6 @@ function install_buildenv() {
            python3-docutils \
            python3-pytest \
            qemu-utils \
-            scrub \
            sed \
            systemtap-sdt-dev \
            wireshark-dev \
--- a/ci/buildenv/fedora-37.sh
+++ b/ci/buildenv/fedora-37.sh
@ -68,6 +68,7 @@ function install_buildenv() {
        pkgconfig \
        polkit \
        python3 \
+        python3-black \
        python3-docutils \
        python3-flake8 \
        python3-pytest \
@ -75,7 +76,6 @@ function install_buildenv() {
        readline-devel \
        rpm-build \
        sanlock-devel \
-        scrub \
        sed \
        systemd-devel \
        systemd-rpm-macros \
--- a/ci/buildenv/fedora-38-cross-mingw32.sh
+++ b/ci/buildenv/fedora-38-cross-mingw32.sh
@ -39,12 +39,12 @@ function install_buildenv() {
        perl-base \
        polkit \
        python3 \
+        python3-black \
        python3-docutils \
        python3-flake8 \
        python3-pytest \
        qemu-img \
        rpm-build \
-        scrub \
        sed \
        systemd-rpm-macros
    dnf install -y \
--- a/ci/buildenv/fedora-38-cross-mingw64.sh
+++ b/ci/buildenv/fedora-38-cross-mingw64.sh
@ -39,12 +39,12 @@ function install_buildenv() {
        perl-base \
        polkit \
        python3 \
+        python3-black \
        python3-docutils \
        python3-flake8 \
        python3-pytest \
        qemu-img \
        rpm-build \
-        scrub \
        sed \
        systemd-rpm-macros
    dnf install -y \
--- a/ci/buildenv/fedora-38.sh
+++ b/ci/buildenv/fedora-38.sh
@ -68,6 +68,7 @@ function install_buildenv() {
        pkgconfig \
        polkit \
        python3 \
+        python3-black \
        python3-docutils \
        python3-flake8 \
        python3-pytest \
@ -75,7 +76,6 @@ function install_buildenv() {
        readline-devel \
        rpm-build \
        sanlock-devel \
-        scrub \
        sed \
        systemd-devel \
        systemd-rpm-macros \
--- a/ci/buildenv/fedora-rawhide-cross-mingw32.sh
+++ b/ci/buildenv/fedora-rawhide-cross-mingw32.sh
@ -40,12 +40,12 @@ function install_buildenv() {
        perl-base \
        polkit \
        python3 \
+        python3-black \
        python3-docutils \
        python3-flake8 \
        python3-pytest \
        qemu-img \
        rpm-build \
-        scrub \
        sed \
        systemd-rpm-macros
    dnf install -y \
--- a/ci/buildenv/fedora-rawhide-cross-mingw64.sh
+++ b/ci/buildenv/fedora-rawhide-cross-mingw64.sh
@ -40,12 +40,12 @@ function install_buildenv() {
        perl-base \
        polkit \
        python3 \
+        python3-black \
        python3-docutils \
        python3-flake8 \
        python3-pytest \
        qemu-img \
        rpm-build \
-        scrub \
        sed \
        systemd-rpm-macros
    dnf install -y \
--- a/ci/buildenv/fedora-rawhide.sh
+++ b/ci/buildenv/fedora-rawhide.sh
@ -69,6 +69,7 @@ function install_buildenv() {
        pkgconfig \
        polkit \
        python3 \
+        python3-black \
        python3-docutils \
        python3-flake8 \
        python3-pytest \
@ -76,7 +77,6 @@ function install_buildenv() {
        readline-devel \
        rpm-build \
        sanlock-devel \
-        scrub \
        sed \
        systemd-devel \
        systemd-rpm-macros \
--- a/ci/buildenv/opensuse-leap-15.sh
+++ b/ci/buildenv/opensuse-leap-15.sh
@ -72,12 +72,14 @@ function install_buildenv() {
           python3-base \
           python3-docutils \
           python3-flake8 \
+           python3-pip \
           python3-pytest \
+           python3-setuptools \
+           python3-wheel \
           qemu-tools \
           readline-devel \
           rpm-build \
           sanlock-devel \
-           scrub \
           sed \
           systemd-rpm-macros \
           systemtap-sdt-devel \
@ -88,6 +90,7 @@ function install_buildenv() {
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
+    /usr/bin/pip3 install black
 }

 export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
--- a/ci/buildenv/opensuse-tumbleweed.sh
+++ b/ci/buildenv/opensuse-tumbleweed.sh
@ -70,14 +70,14 @@ function install_buildenv() {
           pkgconfig \
           polkit \
           python3-base \
+           python3-black \
           python3-docutils \
+           python3-flake8 \
           python3-pytest \
-           python39-flake8 \
           qemu-tools \
           readline-devel \
           rpm-build \
           sanlock-devel \
-           scrub \
           sed \
           systemd-rpm-macros \
           systemtap-sdt-devel \
--- a/ci/buildenv/ubuntu-2004.sh
+++ b/ci/buildenv/ubuntu-2004.sh
@ -12,6 +12,7 @@ function install_buildenv() {
            augeas-lenses \
            augeas-tools \
            bash-completion \
+            black \
            ca-certificates \
            ccache \
            clang \
@ -80,7 +81,6 @@ function install_buildenv() {
            python3-setuptools \
            python3-wheel \
            qemu-utils \
-            scrub \
            sed \
            systemtap-sdt-dev \
            wireshark-dev \
--- a/ci/buildenv/ubuntu-2204.sh
+++ b/ci/buildenv/ubuntu-2204.sh
@ -12,6 +12,7 @@ function install_buildenv() {
            augeas-lenses \
            augeas-tools \
            bash-completion \
+            black \
            ca-certificates \
            ccache \
            clang \
@ -78,7 +79,6 @@ function install_buildenv() {
            python3-docutils \
            python3-pytest \
            qemu-utils \
-            scrub \
            sed \
            systemtap-sdt-dev \
            wireshark-dev \
--- a/ci/cirrus/freebsd-12.vars
+++ b/ci/cirrus/freebsd-12.vars
@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
 NINJA='/usr/local/bin/ninja'
 PACKAGING_COMMAND='pkg'
 PIP3='/usr/local/bin/pip-3.8'
-PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py39-docutils py39-flake8 py39-pytest python3 qemu readline yajl'
+PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py39-black py39-docutils py39-flake8 py39-pytest python3 qemu readline yajl'
 PYPI_PKGS=''
 PYTHON='/usr/local/bin/python3'
--- a/ci/cirrus/freebsd-13.vars
+++ b/ci/cirrus/freebsd-13.vars
@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
 NINJA='/usr/local/bin/ninja'
 PACKAGING_COMMAND='pkg'
 PIP3='/usr/local/bin/pip-3.8'
-PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py39-docutils py39-flake8 py39-pytest python3 qemu readline yajl'
+PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py39-black py39-docutils py39-flake8 py39-pytest python3 qemu readline yajl'
 PYPI_PKGS=''
 PYTHON='/usr/local/bin/python3'
--- a/ci/cirrus/macos-13.vars
+++ b/ci/cirrus/macos-13.vars
@ -11,6 +11,6 @@ MAKE='/opt/homebrew/bin/gmake'
 NINJA='/opt/homebrew/bin/ninja'
 PACKAGING_COMMAND='brew'
 PIP3='/opt/homebrew/bin/pip3'
-PKGS='augeas bash-completion ccache codespell cppi curl diffutils docutils flake8 gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline scrub yajl'
+PKGS='augeas bash-completion black ccache codespell cppi curl diffutils docutils flake8 gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline yajl'
 PYPI_PKGS='pytest'
 PYTHON='/opt/homebrew/bin/python3'
--- a/ci/cirrus/macos-14.vars
+++ b/ci/cirrus/macos-14.vars
@ -11,6 +11,6 @@ MAKE='/opt/homebrew/bin/gmake'
 NINJA='/opt/homebrew/bin/ninja'
 PACKAGING_COMMAND='brew'
 PIP3='/opt/homebrew/bin/pip3'
-PKGS='augeas bash-completion ccache codespell cppi curl diffutils docutils flake8 gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline scrub yajl'
+PKGS='augeas bash-completion black ccache codespell cppi curl diffutils docutils flake8 gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline yajl'
 PYPI_PKGS='pytest'
 PYTHON='/opt/homebrew/bin/python3'
--- a/ci/containers/almalinux-8.Dockerfile
+++ b/ci/containers/almalinux-8.Dockerfile
@ -74,12 +74,14 @@ RUN dnf update -y && \
        python3 \
        python3-docutils \
        python3-flake8 \
+        python3-pip \
        python3-pytest \
+        python3-setuptools \
+        python3-wheel \
        qemu-img \
        readline-devel \
        rpm-build \
        sanlock-devel \
-        scrub \
        sed \
        systemd-devel \
        systemd-rpm-macros \
@ -94,6 +96,8 @@ RUN dnf update -y && \
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc

+RUN /usr/bin/pip3 install black
+
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
--- a/ci/containers/alpine-317.Dockerfile
+++ b/ci/containers/alpine-317.Dockerfile
@ -14,6 +14,7 @@ RUN apk update && \
        audit-dev \
        augeas \
        bash-completion \
+        black \
        ca-certificates \
        ccache \
        ceph-dev \
--- a/ci/containers/alpine-edge.Dockerfile
+++ b/ci/containers/alpine-edge.Dockerfile
@ -14,6 +14,7 @@ RUN apk update && \
        audit-dev \
        augeas \
        bash-completion \
+        black \
        ca-certificates \
        ccache \
        ceph-dev \
--- a/ci/containers/centos-stream-8.Dockerfile
+++ b/ci/containers/centos-stream-8.Dockerfile
@ -75,12 +75,14 @@ RUN dnf distro-sync -y && \
        python3 \
        python3-docutils \
        python3-flake8 \
+        python3-pip \
        python3-pytest \
+        python3-setuptools \
+        python3-wheel \
        qemu-img \
        readline-devel \
        rpm-build \
        sanlock-devel \
-        scrub \
        sed \
        systemd-devel \
        systemd-rpm-macros \
@ -95,6 +97,8 @@ RUN dnf distro-sync -y && \
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc

+RUN /usr/bin/pip3 install black
+
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
--- a/ci/containers/centos-stream-9.Dockerfile
+++ b/ci/containers/centos-stream-9.Dockerfile
@ -71,12 +71,14 @@ RUN dnf distro-sync -y && \
        python3 \
        python3-docutils \
        python3-flake8 \
+        python3-pip \
        python3-pytest \
+        python3-setuptools \
+        python3-wheel \
        qemu-img \
        readline-devel \
        rpm-build \
        sanlock-devel \
-        scrub \
        sed \
        systemd-devel \
        systemd-rpm-macros \
@ -91,6 +93,8 @@ RUN dnf distro-sync -y && \
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc

+RUN /usr/bin/pip3 install black
+
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
--- a/ci/containers/debian-11-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-11-cross-aarch64.Dockerfile
@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      augeas-lenses \
                      augeas-tools \
                      bash-completion \
+                      black \
                      ca-certificates \
                      ccache \
                      codespell \
@ -44,7 +45,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      python3-docutils \
                      python3-pytest \
                      qemu-utils \
-                      scrub \
                      sed \
                      xsltproc && \
    eatmydata apt-get autoremove -y && \
--- a/ci/containers/debian-11-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-11-cross-armv6l.Dockerfile
@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      augeas-lenses \
                      augeas-tools \
                      bash-completion \
+                      black \
                      ca-certificates \
                      ccache \
                      codespell \
@ -44,7 +45,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      python3-docutils \
                      python3-pytest \
                      qemu-utils \
-                      scrub \
                      sed \
                      xsltproc && \
    eatmydata apt-get autoremove -y && \
--- a/ci/containers/debian-11-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-11-cross-armv7l.Dockerfile
@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      augeas-lenses \
                      augeas-tools \
                      bash-completion \
+                      black \
                      ca-certificates \
                      ccache \
                      codespell \
@ -44,7 +45,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      python3-docutils \
                      python3-pytest \
                      qemu-utils \
-                      scrub \
                      sed \
                      xsltproc && \
    eatmydata apt-get autoremove -y && \
--- a/ci/containers/debian-11-cross-i686.Dockerfile
+++ b/ci/containers/debian-11-cross-i686.Dockerfile
@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      augeas-lenses \
                      augeas-tools \
                      bash-completion \
+                      black \
                      ca-certificates \
                      ccache \
                      codespell \
@ -44,7 +45,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      python3-docutils \
                      python3-pytest \
                      qemu-utils \
-                      scrub \
                      sed \
                      xsltproc && \
    eatmydata apt-get autoremove -y && \
--- a/ci/containers/debian-11-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-11-cross-mips64el.Dockerfile
@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      augeas-lenses \
                      augeas-tools \
                      bash-completion \
+                      black \
                      ca-certificates \
                      ccache \
                      codespell \
@ -44,7 +45,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      python3-docutils \
                      python3-pytest \
                      qemu-utils \
-                      scrub \
                      sed \
                      xsltproc && \
    eatmydata apt-get autoremove -y && \
--- a/ci/containers/debian-11-cross-mipsel.Dockerfile
+++ b/ci/containers/debian-11-cross-mipsel.Dockerfile
@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      augeas-lenses \
                      augeas-tools \
                      bash-completion \
+                      black \
                      ca-certificates \
                      ccache \
                      codespell \
@ -44,7 +45,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      python3-docutils \
                      python3-pytest \
                      qemu-utils \
-                      scrub \
                      sed \
                      xsltproc && \
    eatmydata apt-get autoremove -y && \
--- a/ci/containers/debian-11-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-11-cross-ppc64le.Dockerfile
@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      augeas-lenses \
                      augeas-tools \
                      bash-completion \
+                      black \
                      ca-certificates \
                      ccache \
                      codespell \
@ -44,7 +45,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      python3-docutils \
                      python3-pytest \
                      qemu-utils \
-                      scrub \
                      sed \
                      xsltproc && \
    eatmydata apt-get autoremove -y && \
--- a/ci/containers/debian-11-cross-s390x.Dockerfile
+++ b/ci/containers/debian-11-cross-s390x.Dockerfile
@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      augeas-lenses \
                      augeas-tools \
                      bash-completion \
+                      black \
                      ca-certificates \
                      ccache \
                      codespell \
@ -44,7 +45,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      python3-docutils \
                      python3-pytest \
                      qemu-utils \
-                      scrub \
                      sed \
                      xsltproc && \
    eatmydata apt-get autoremove -y && \
--- a/ci/containers/debian-11.Dockerfile
+++ b/ci/containers/debian-11.Dockerfile
@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      augeas-lenses \
                      augeas-tools \
                      bash-completion \
+                      black \
                      ca-certificates \
                      ccache \
                      clang \
@ -79,7 +80,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      python3-docutils \
                      python3-pytest \
                      qemu-utils \
-                      scrub \
                      sed \
                      systemtap-sdt-dev \
                      wireshark-dev \
--- a/ci/containers/debian-12-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-12-cross-aarch64.Dockerfile
@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      augeas-lenses \
                      augeas-tools \
                      bash-completion \
+                      black \
                      ca-certificates \
                      ccache \
                      codespell \
@ -45,7 +46,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      python3-docutils \
                      python3-pytest \
                      qemu-utils \
-                      scrub \
                      sed \
                      xsltproc && \
    eatmydata apt-get autoremove -y && \
--- a/ci/containers/debian-12-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-12-cross-armv6l.Dockerfile
@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      augeas-lenses \
                      augeas-tools \
                      bash-completion \
+                      black \
                      ca-certificates \
                      ccache \
                      codespell \
@ -45,7 +46,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      python3-docutils \
                      python3-pytest \
                      qemu-utils \
-                      scrub \
                      sed \
                      xsltproc && \
    eatmydata apt-get autoremove -y && \
--- a/ci/containers/debian-12-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-12-cross-armv7l.Dockerfile
@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      augeas-lenses \
                      augeas-tools \
                      bash-completion \
+                      black \
                      ca-certificates \
                      ccache \
                      codespell \
@ -45,7 +46,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      python3-docutils \
                      python3-pytest \
                      qemu-utils \
-                      scrub \
                      sed \
                      xsltproc && \
    eatmydata apt-get autoremove -y && \
--- a/ci/containers/debian-12-cross-i686.Dockerfile
+++ b/ci/containers/debian-12-cross-i686.Dockerfile
@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      augeas-lenses \
                      augeas-tools \
                      bash-completion \
+                      black \
                      ca-certificates \
                      ccache \
                      codespell \
@ -45,7 +46,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      python3-docutils \
                      python3-pytest \
                      qemu-utils \
-                      scrub \
                      sed \
                      xsltproc && \
    eatmydata apt-get autoremove -y && \
--- a/ci/containers/debian-12-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-12-cross-mips64el.Dockerfile
@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      augeas-lenses \
                      augeas-tools \
                      bash-completion \
+                      black \
                      ca-certificates \
                      ccache \
                      codespell \
@ -45,7 +46,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      python3-docutils \
                      python3-pytest \
                      qemu-utils \
-                      scrub \
                      sed \
                      xsltproc && \
    eatmydata apt-get autoremove -y && \
--- a/ci/containers/debian-12-cross-mipsel.Dockerfile
+++ b/ci/containers/debian-12-cross-mipsel.Dockerfile
@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      augeas-lenses \
                      augeas-tools \
                      bash-completion \
+                      black \
                      ca-certificates \
                      ccache \
                      codespell \
@ -45,7 +46,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      python3-docutils \
                      python3-pytest \
                      qemu-utils \
-                      scrub \
                      sed \
                      xsltproc && \
    eatmydata apt-get autoremove -y && \
--- a/ci/containers/debian-12-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-12-cross-ppc64le.Dockerfile
@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      augeas-lenses \
                      augeas-tools \
                      bash-completion \
+                      black \
                      ca-certificates \
                      ccache \
                      codespell \
@ -45,7 +46,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      python3-docutils \
                      python3-pytest \
                      qemu-utils \
-                      scrub \
                      sed \
                      xsltproc && \
    eatmydata apt-get autoremove -y && \
--- a/ci/containers/debian-12-cross-s390x.Dockerfile
+++ b/ci/containers/debian-12-cross-s390x.Dockerfile
@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      augeas-lenses \
                      augeas-tools \
                      bash-completion \
+                      black \
                      ca-certificates \
                      ccache \
                      codespell \
@ -45,7 +46,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      python3-docutils \
                      python3-pytest \
                      qemu-utils \
-                      scrub \
                      sed \
                      xsltproc && \
    eatmydata apt-get autoremove -y && \
--- a/ci/containers/debian-12.Dockerfile
+++ b/ci/containers/debian-12.Dockerfile
@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      augeas-lenses \
                      augeas-tools \
                      bash-completion \
+                      black \
                      ca-certificates \
                      ccache \
                      clang \
@ -79,7 +80,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      python3-docutils \
                      python3-pytest \
                      qemu-utils \
-                      scrub \
                      sed \
                      systemtap-sdt-dev \
                      wireshark-dev \
--- a/ci/containers/debian-sid-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile
@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      augeas-lenses \
                      augeas-tools \
                      bash-completion \
+                      black \
                      ca-certificates \
                      ccache \
                      codespell \
@ -45,7 +46,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      python3-docutils \
                      python3-pytest \
                      qemu-utils \
-                      scrub \
                      sed \
                      xsltproc && \
    eatmydata apt-get autoremove -y && \
--- a/ci/containers/debian-sid-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile
@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      augeas-lenses \
                      augeas-tools \
                      bash-completion \
+                      black \
                      ca-certificates \
                      ccache \
                      codespell \
@ -45,7 +46,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      python3-docutils \
                      python3-pytest \
                      qemu-utils \
-                      scrub \
                      sed \
                      xsltproc && \
    eatmydata apt-get autoremove -y && \
--- a/ci/containers/debian-sid-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile
@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      augeas-lenses \
                      augeas-tools \
                      bash-completion \
+                      black \
                      ca-certificates \
                      ccache \
                      codespell \
@ -45,7 +46,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      python3-docutils \
                      python3-pytest \
                      qemu-utils \
-                      scrub \
                      sed \
                      xsltproc && \
    eatmydata apt-get autoremove -y && \
--- a/ci/containers/debian-sid-cross-i686.Dockerfile
+++ b/ci/containers/debian-sid-cross-i686.Dockerfile
@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      augeas-lenses \
                      augeas-tools \
                      bash-completion \
+                      black \
                      ca-certificates \
                      ccache \
                      codespell \
@ -45,7 +46,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      python3-docutils \
                      python3-pytest \
                      qemu-utils \
-                      scrub \
                      sed \
                      xsltproc && \
    eatmydata apt-get autoremove -y && \
--- a/ci/containers/debian-sid-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile
@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      augeas-lenses \
                      augeas-tools \
                      bash-completion \
+                      black \
                      ca-certificates \
                      ccache \
                      codespell \
@ -45,7 +46,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      python3-docutils \
                      python3-pytest \
                      qemu-utils \
-                      scrub \
                      sed \
                      xsltproc && \
    eatmydata apt-get autoremove -y && \
--- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile
@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      augeas-lenses \
                      augeas-tools \
                      bash-completion \
+                      black \
                      ca-certificates \
                      ccache \
                      codespell \
@ -45,7 +46,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      python3-docutils \
                      python3-pytest \
                      qemu-utils \
-                      scrub \
                      sed \
                      xsltproc && \
    eatmydata apt-get autoremove -y && \
--- a/ci/containers/debian-sid-cross-s390x.Dockerfile
+++ b/ci/containers/debian-sid-cross-s390x.Dockerfile
@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      augeas-lenses \
                      augeas-tools \
                      bash-completion \
+                      black \
                      ca-certificates \
                      ccache \
                      codespell \
@ -45,7 +46,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      python3-docutils \
                      python3-pytest \
                      qemu-utils \
-                      scrub \
                      sed \
                      xsltproc && \
    eatmydata apt-get autoremove -y && \
--- a/ci/containers/debian-sid.Dockerfile
+++ b/ci/containers/debian-sid.Dockerfile
@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      augeas-lenses \
                      augeas-tools \
                      bash-completion \
+                      black \
                      ca-certificates \
                      ccache \
                      clang \
@ -79,7 +80,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      python3-docutils \
                      python3-pytest \
                      qemu-utils \
-                      scrub \
                      sed \
                      systemtap-sdt-dev \
                      wireshark-dev \
--- a/ci/containers/fedora-37.Dockerfile
+++ b/ci/containers/fedora-37.Dockerfile
@ -79,6 +79,7 @@ exec "$@"\n' > /usr/bin/nosync && \
               pkgconfig \
               polkit \
               python3 \
+               python3-black \
               python3-docutils \
               python3-flake8 \
               python3-pytest \
@ -86,7 +87,6 @@ exec "$@"\n' > /usr/bin/nosync && \
               readline-devel \
               rpm-build \
               sanlock-devel \
-               scrub \
               sed \
               systemd-devel \
               systemd-rpm-macros \
--- a/ci/containers/fedora-38-cross-mingw32.Dockerfile
+++ b/ci/containers/fedora-38-cross-mingw32.Dockerfile
@ -50,12 +50,12 @@ exec "$@"\n' > /usr/bin/nosync && \
               perl-base \
               polkit \
               python3 \
+               python3-black \
               python3-docutils \
               python3-flake8 \
               python3-pytest \
               qemu-img \
               rpm-build \
-               scrub \
               sed \
               systemd-rpm-macros && \
    nosync dnf autoremove -y && \
--- a/ci/containers/fedora-38-cross-mingw64.Dockerfile
+++ b/ci/containers/fedora-38-cross-mingw64.Dockerfile
@ -50,12 +50,12 @@ exec "$@"\n' > /usr/bin/nosync && \
               perl-base \
               polkit \
               python3 \
+               python3-black \
               python3-docutils \
               python3-flake8 \
               python3-pytest \
               qemu-img \
               rpm-build \
-               scrub \
               sed \
               systemd-rpm-macros && \
    nosync dnf autoremove -y && \
--- a/ci/containers/fedora-38.Dockerfile
+++ b/ci/containers/fedora-38.Dockerfile
@ -79,6 +79,7 @@ exec "$@"\n' > /usr/bin/nosync && \
               pkgconfig \
               polkit \
               python3 \
+               python3-black \
               python3-docutils \
               python3-flake8 \
               python3-pytest \
@ -86,7 +87,6 @@ exec "$@"\n' > /usr/bin/nosync && \
               readline-devel \
               rpm-build \
               sanlock-devel \
-               scrub \
               sed \
               systemd-devel \
               systemd-rpm-macros \
--- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
+++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
@ -51,12 +51,12 @@ exec "$@"\n' > /usr/bin/nosync && \
               perl-base \
               polkit \
               python3 \
+               python3-black \
               python3-docutils \
               python3-flake8 \
               python3-pytest \
               qemu-img \
               rpm-build \
-               scrub \
               sed \
               systemd-rpm-macros && \
    nosync dnf autoremove -y && \
--- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
+++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
@ -51,12 +51,12 @@ exec "$@"\n' > /usr/bin/nosync && \
               perl-base \
               polkit \
               python3 \
+               python3-black \
               python3-docutils \
               python3-flake8 \
               python3-pytest \
               qemu-img \
               rpm-build \
-               scrub \
               sed \
               systemd-rpm-macros && \
    nosync dnf autoremove -y && \
--- a/ci/containers/fedora-rawhide.Dockerfile
+++ b/ci/containers/fedora-rawhide.Dockerfile
@ -80,6 +80,7 @@ exec "$@"\n' > /usr/bin/nosync && \
               pkgconfig \
               polkit \
               python3 \
+               python3-black \
               python3-docutils \
               python3-flake8 \
               python3-pytest \
@ -87,7 +88,6 @@ exec "$@"\n' > /usr/bin/nosync && \
               readline-devel \
               rpm-build \
               sanlock-devel \
-               scrub \
               sed \
               systemd-devel \
               systemd-rpm-macros \
--- a/ci/containers/opensuse-leap-15.Dockerfile
+++ b/ci/containers/opensuse-leap-15.Dockerfile
@ -73,12 +73,14 @@ RUN zypper update -y && \
           python3-base \
           python3-docutils \
           python3-flake8 \
+           python3-pip \
           python3-pytest \
+           python3-setuptools \
+           python3-wheel \
           qemu-tools \
           readline-devel \
           rpm-build \
           sanlock-devel \
-           scrub \
           sed \
           systemd-rpm-macros \
           systemtap-sdt-devel \
@ -91,6 +93,8 @@ RUN zypper update -y && \
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc

+RUN /usr/bin/pip3 install black
+
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
--- a/ci/containers/opensuse-tumbleweed.Dockerfile
+++ b/ci/containers/opensuse-tumbleweed.Dockerfile
@ -71,14 +71,14 @@ RUN zypper dist-upgrade -y && \
           pkgconfig \
           polkit \
           python3-base \
+           python3-black \
           python3-docutils \
+           python3-flake8 \
           python3-pytest \
-           python39-flake8 \
           qemu-tools \
           readline-devel \
           rpm-build \
           sanlock-devel \
-           scrub \
           sed \
           systemd-rpm-macros \
           systemtap-sdt-devel \
--- a/ci/containers/ubuntu-2004.Dockerfile
+++ b/ci/containers/ubuntu-2004.Dockerfile
@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      augeas-lenses \
                      augeas-tools \
                      bash-completion \
+                      black \
                      ca-certificates \
                      ccache \
                      clang \
@ -82,7 +83,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      python3-setuptools \
                      python3-wheel \
                      qemu-utils \
-                      scrub \
                      sed \
                      systemtap-sdt-dev \
                      wireshark-dev \
--- a/ci/containers/ubuntu-2204.Dockerfile
+++ b/ci/containers/ubuntu-2204.Dockerfile
@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      augeas-lenses \
                      augeas-tools \
                      bash-completion \
+                      black \
                      ca-certificates \
                      ccache \
                      clang \
@ -80,7 +81,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      python3-docutils \
                      python3-pytest \
                      qemu-utils \
-                      scrub \
                      sed \
                      systemtap-sdt-dev \
                      wireshark-dev \