ci: Refresh generated files

Add black, drop scrub.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/ci/buildenv/almalinux-8.sh b/ci/buildenv/almalinux-8.sh
index 0f0e66ef9a8796df44fa780776908f490aa21134..322f8fc062dd04dbd1a8e6e98c8c06337431b120 100644 (file)
--- 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"

diff --git a/ci/buildenv/alpine-317.sh b/ci/buildenv/alpine-317.sh
index d11c24705188b6772a2c35476bef4fb37ec8cc6d..18aaa936eb01f45322aaf3d96a290afda111919d 100644 (file)
--- 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 \

diff --git a/ci/buildenv/alpine-edge.sh b/ci/buildenv/alpine-edge.sh
index d11c24705188b6772a2c35476bef4fb37ec8cc6d..18aaa936eb01f45322aaf3d96a290afda111919d 100644 (file)
--- 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 \

diff --git a/ci/buildenv/centos-stream-8.sh b/ci/buildenv/centos-stream-8.sh
index 58adc956333615e0f55b00d30e68e8b7b857174a..44e39a91125e922c3ad13fbb430d2aeb323b82a9 100644 (file)
--- 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"

diff --git a/ci/buildenv/centos-stream-9.sh b/ci/buildenv/centos-stream-9.sh
index 28960fff46570e0c52e3f45e7e710d5880e82f72..794c731016b3b722cb02061e7b834b7b72d6d78a 100644 (file)
--- 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"

diff --git a/ci/buildenv/debian-11-cross-aarch64.sh b/ci/buildenv/debian-11-cross-aarch64.sh
index ba0062577fef77c0c5d492a3f5fd06151c7f8630..0b8f7046c7cce51d6d437340d44c598549d52b99 100644 (file)
--- 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

diff --git a/ci/buildenv/debian-11-cross-armv6l.sh b/ci/buildenv/debian-11-cross-armv6l.sh
index 272cb71c8a45b59482c29074fdf5774729078e82..9a36c4be5b456ae6cdbceca6233dffbc4d7ba0cb 100644 (file)
--- 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

diff --git a/ci/buildenv/debian-11-cross-armv7l.sh b/ci/buildenv/debian-11-cross-armv7l.sh
index 4cbb2bddf15c27ea78030f7b8ee4dbc824d7767f..5041e8895c145f08b2d9b7a01923c684eb346284 100644 (file)
--- 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

diff --git a/ci/buildenv/debian-11-cross-i686.sh b/ci/buildenv/debian-11-cross-i686.sh
index 9cb76c85c8b67d6cabed3a6a6e930079dda53f8f..ffdd9d0db9c33fd34ad17069178b4a1beb18d085 100644 (file)
--- 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

diff --git a/ci/buildenv/debian-11-cross-mips64el.sh b/ci/buildenv/debian-11-cross-mips64el.sh
index 3960d6f949668ee6854cea63b3af7356d74352cd..a1727dcca3783fdc62f31f5265d141d75cbabba3 100644 (file)
--- 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

diff --git a/ci/buildenv/debian-11-cross-mipsel.sh b/ci/buildenv/debian-11-cross-mipsel.sh
index 787da139979a75a4fed6f58307ee84a08fe34817..4edad75f645762e7212713c03deeb64cf47410f5 100644 (file)
--- 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

diff --git a/ci/buildenv/debian-11-cross-ppc64le.sh b/ci/buildenv/debian-11-cross-ppc64le.sh
index 60fd2e116cbceacc91660ea5f7b9cd75cde37f62..be74683905073c82a658bdec3f566dce4852773e 100644 (file)
--- 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

diff --git a/ci/buildenv/debian-11-cross-s390x.sh b/ci/buildenv/debian-11-cross-s390x.sh
index b7035710164667f2d249d7813f6275de389f755e..a4641bcae8488fbff64d534bad01a20275263e08 100644 (file)
--- 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

diff --git a/ci/buildenv/debian-11.sh b/ci/buildenv/debian-11.sh
index 353bc76567283fea38f4e4f88d4f3edc7154199f..d445616684cd095a36c0e841a1a1aa316fa2c879 100644 (file)
--- 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 \

diff --git a/ci/buildenv/debian-12-cross-aarch64.sh b/ci/buildenv/debian-12-cross-aarch64.sh
index 16857a60c815b474af6d7cf7835517d31d025966..ecedf390f6026ae25b238c3b0874cdf444261c43 100644 (file)
--- 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

diff --git a/ci/buildenv/debian-12-cross-armv6l.sh b/ci/buildenv/debian-12-cross-armv6l.sh
index 8d758a195b1c8825ea04b60f2ee9e9184bd97192..f65856143db49b2cbd0cdbba6abf10a789105ecc 100644 (file)
--- 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

diff --git a/ci/buildenv/debian-12-cross-armv7l.sh b/ci/buildenv/debian-12-cross-armv7l.sh
index 08e1b08d4d1a6ea0c9eeb1593f8bffb3fef60546..e74f363fcb9ad2643ed56c1143b88a6d6a4cd96f 100644 (file)
--- 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

diff --git a/ci/buildenv/debian-12-cross-i686.sh b/ci/buildenv/debian-12-cross-i686.sh
index 37142cb0c36b1577649ae96ab9c991622944d3e2..c0e194c5521fbb28255103dc390f3df9d2a4dc80 100644 (file)
--- 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

diff --git a/ci/buildenv/debian-12-cross-mips64el.sh b/ci/buildenv/debian-12-cross-mips64el.sh
index aab7c72a4f1b08071658a4f4da9e9e2cb9476ef4..f374c3337966b16b2fa43af4bb7933ff58d450be 100644 (file)
--- 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

diff --git a/ci/buildenv/debian-12-cross-mipsel.sh b/ci/buildenv/debian-12-cross-mipsel.sh
index c188d46f41d306d306007810fb5761ed88be8678..23d4052c42e60a01b814452d13517b61468f76de 100644 (file)
--- 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

diff --git a/ci/buildenv/debian-12-cross-ppc64le.sh b/ci/buildenv/debian-12-cross-ppc64le.sh
index 75b82147f9ca11426f5fdf7eb74a984fee1edcea..5fd07da2c80e1e5b82cbf7e1a52918dbae116468 100644 (file)
--- 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

diff --git a/ci/buildenv/debian-12-cross-s390x.sh b/ci/buildenv/debian-12-cross-s390x.sh
index e537333efbdb2acf9818a2cf1ebd2897e284b31d..a9f206364285cbe1bedbc4b3f6610fb37cee649d 100644 (file)
--- 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

diff --git a/ci/buildenv/debian-12.sh b/ci/buildenv/debian-12.sh
index 5b259a243af5ae1f8ee9d4d259d57d9708e11151..01521b9074c0ead9c13b0778e10b1eac763db5a3 100644 (file)
--- 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 \

diff --git a/ci/buildenv/debian-sid-cross-aarch64.sh b/ci/buildenv/debian-sid-cross-aarch64.sh
index 16857a60c815b474af6d7cf7835517d31d025966..ecedf390f6026ae25b238c3b0874cdf444261c43 100644 (file)
--- 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

diff --git a/ci/buildenv/debian-sid-cross-armv6l.sh b/ci/buildenv/debian-sid-cross-armv6l.sh
index 69a5612d011134e744230205ccecc2af44993cb5..81ac6defb28802ad8aeed00c0b27ef062560ccd8 100644 (file)
--- 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

diff --git a/ci/buildenv/debian-sid-cross-armv7l.sh b/ci/buildenv/debian-sid-cross-armv7l.sh
index 2f59aa420323c48a330ad02b38a0e3bd4d97fe12..30ff3e53812e5ebcd0d0c4ca69b1310cae660e28 100644 (file)
--- 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

diff --git a/ci/buildenv/debian-sid-cross-i686.sh b/ci/buildenv/debian-sid-cross-i686.sh
index f096fa88c6e94780814fb282c3f2a927286fe07e..04cccfd05fed9e3ea7e343ba888d4fe38030228f 100644 (file)
--- 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

diff --git a/ci/buildenv/debian-sid-cross-mips64el.sh b/ci/buildenv/debian-sid-cross-mips64el.sh
index aab7c72a4f1b08071658a4f4da9e9e2cb9476ef4..f374c3337966b16b2fa43af4bb7933ff58d450be 100644 (file)
--- 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

diff --git a/ci/buildenv/debian-sid-cross-ppc64le.sh b/ci/buildenv/debian-sid-cross-ppc64le.sh
index 75b82147f9ca11426f5fdf7eb74a984fee1edcea..5fd07da2c80e1e5b82cbf7e1a52918dbae116468 100644 (file)
--- 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

diff --git a/ci/buildenv/debian-sid-cross-s390x.sh b/ci/buildenv/debian-sid-cross-s390x.sh
index e537333efbdb2acf9818a2cf1ebd2897e284b31d..a9f206364285cbe1bedbc4b3f6610fb37cee649d 100644 (file)
--- 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

diff --git a/ci/buildenv/debian-sid.sh b/ci/buildenv/debian-sid.sh
index 5b259a243af5ae1f8ee9d4d259d57d9708e11151..01521b9074c0ead9c13b0778e10b1eac763db5a3 100644 (file)
--- 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 \

diff --git a/ci/buildenv/fedora-37.sh b/ci/buildenv/fedora-37.sh
index 10c5e1651f8f28fc476cb8074a886de42b9a4db6..2e7ec0d2e9c1bb26f18be1984ab00d34dea0eb24 100644 (file)
--- 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 \

diff --git a/ci/buildenv/fedora-38-cross-mingw32.sh b/ci/buildenv/fedora-38-cross-mingw32.sh
index 3b1479d945ded5b96afb1a4656e12dc2ac224cde..325e953dec230921daa4f31de3956acbd4e2a0b2 100644 (file)
--- 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 \

diff --git a/ci/buildenv/fedora-38-cross-mingw64.sh b/ci/buildenv/fedora-38-cross-mingw64.sh
index 5ab11f7af1df5dc9f136c5662d5272b1ac6314e3..4e79a753d26f32152687464f6304b50cbccfd2c5 100644 (file)
--- 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 \

diff --git a/ci/buildenv/fedora-38.sh b/ci/buildenv/fedora-38.sh
index 10c5e1651f8f28fc476cb8074a886de42b9a4db6..2e7ec0d2e9c1bb26f18be1984ab00d34dea0eb24 100644 (file)
--- 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 \

diff --git a/ci/buildenv/fedora-rawhide-cross-mingw32.sh b/ci/buildenv/fedora-rawhide-cross-mingw32.sh
index 2dba1c835b9a629d6661ee380926813b261f435e..01c89b5019c6eebe04773d040012306fb2e2c6dd 100644 (file)
--- 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 \

diff --git a/ci/buildenv/fedora-rawhide-cross-mingw64.sh b/ci/buildenv/fedora-rawhide-cross-mingw64.sh
index 9ccd1c9914688f73bbc3f8f5e092e0ebe9701ba6..918179454e472748e637a65963b3dc2bc5f465d5 100644 (file)
--- 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 \

diff --git a/ci/buildenv/fedora-rawhide.sh b/ci/buildenv/fedora-rawhide.sh
index 198fb85659e155716216f50ef83048a26ca00955..8af23ea834fbee7dc7ef77418524f46c93abd30b 100644 (file)
--- 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 \

diff --git a/ci/buildenv/opensuse-leap-15.sh b/ci/buildenv/opensuse-leap-15.sh
index 50fa7336126a5c68743443e43bf58ac9167b10af..6bdd248cf0f1555fab9413fc95763929997a662f 100644 (file)
--- 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"

diff --git a/ci/buildenv/opensuse-tumbleweed.sh b/ci/buildenv/opensuse-tumbleweed.sh
index 56854136d3da871ef4da0316181b69885770d09b..ca0face186b992770058d63644e12d53dd06dd4f 100644 (file)
--- 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 \

diff --git a/ci/buildenv/ubuntu-2004.sh b/ci/buildenv/ubuntu-2004.sh
index 3572918758434c4d7409ceff80d11ada9a37cdb9..893f25f0949c91b64293d0de2a2626e0fad33461 100644 (file)
--- 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 \

diff --git a/ci/buildenv/ubuntu-2204.sh b/ci/buildenv/ubuntu-2204.sh
index 153dd942091359af938f8b4a768adb32b05bfa5b..472b6bcf52222b3ddcdaf0fe659e9eb9e31ba82c 100644 (file)
--- 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 \

diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars
index ec8b2e0faf0848512903f39c23e31050594d08ae..278b5834f6b4523e6d1fec5e71563c5bd9c4a8a8 100644 (file)
--- 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'

diff --git a/ci/cirrus/freebsd-13.vars b/ci/cirrus/freebsd-13.vars
index ec8b2e0faf0848512903f39c23e31050594d08ae..278b5834f6b4523e6d1fec5e71563c5bd9c4a8a8 100644 (file)
--- 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'

diff --git a/ci/cirrus/macos-13.vars b/ci/cirrus/macos-13.vars
index b059205480f824334f29f665aca785ffba7f8cc9..ca4e55887cb3ff4d181824b5bef25e7d9936adbc 100644 (file)
--- 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'

diff --git a/ci/cirrus/macos-14.vars b/ci/cirrus/macos-14.vars
index b059205480f824334f29f665aca785ffba7f8cc9..ca4e55887cb3ff4d181824b5bef25e7d9936adbc 100644 (file)
--- 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'

diff --git a/ci/containers/almalinux-8.Dockerfile b/ci/containers/almalinux-8.Dockerfile
index 453fa28c7bb0e1fe082e87326b9af7a1ff965df0..83d0315207f70bd6685d92084f2ae980398895e7 100644 (file)
--- 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"

diff --git a/ci/containers/alpine-317.Dockerfile b/ci/containers/alpine-317.Dockerfile
index 52a2caf5a0841465b15ddf9851ea43f35918eb6f..461b1a7482773f183f796369e64ebeb3217460cc 100644 (file)
--- 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 \

diff --git a/ci/containers/alpine-edge.Dockerfile b/ci/containers/alpine-edge.Dockerfile
index aa78d003725adeb96e5b948ff5722b29a807f85d..50d53399b2099888f9a3fc2e9c15ebd53d964947 100644 (file)
--- 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 \

diff --git a/ci/containers/centos-stream-8.Dockerfile b/ci/containers/centos-stream-8.Dockerfile
index 1ca3bde68c98b343e11d2471691b92eac37cbc2d..b67eb917de87871fb12e3a0561457170798069f7 100644 (file)
--- 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"

diff --git a/ci/containers/centos-stream-9.Dockerfile b/ci/containers/centos-stream-9.Dockerfile
index 6bc61fe8169df55fd60e0a1c19ec0647a2573a6b..5a85ccfeed54f779c6d44077766e8c3411e6f6da 100644 (file)
--- 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"

diff --git a/ci/containers/debian-11-cross-aarch64.Dockerfile b/ci/containers/debian-11-cross-aarch64.Dockerfile
index 4652009d5d8819981cfd1dd8b2370f7224cd778b..61964b02b2e400b1faf3940086366012cb3f3551 100644 (file)
--- 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 && \

diff --git a/ci/containers/debian-11-cross-armv6l.Dockerfile b/ci/containers/debian-11-cross-armv6l.Dockerfile
index 406c6eba4995bc724a67464fc4ea6e7d822e9b77..b8f56c9c1df3b9fac2a711bb7bae3dcca3f9d863 100644 (file)
--- 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 && \

diff --git a/ci/containers/debian-11-cross-armv7l.Dockerfile b/ci/containers/debian-11-cross-armv7l.Dockerfile
index 4d53743de08af9d8b8c294e3a8bee6c1a4de1be4..f7d387c48232be0f06a2e9414bfd201f09fb14ec 100644 (file)
--- 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 && \

diff --git a/ci/containers/debian-11-cross-i686.Dockerfile b/ci/containers/debian-11-cross-i686.Dockerfile
index 52130cd52abc6b1f632c955b1ae48e6ac3152f09..4d28a3dfa993dcf06845bf575e3ef3b3d5dc1f82 100644 (file)
--- 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 && \

diff --git a/ci/containers/debian-11-cross-mips64el.Dockerfile b/ci/containers/debian-11-cross-mips64el.Dockerfile
index 8becb6eca953d7ea51135b35c562041308e57970..9603fccf512be82cd781645a624894b24987da8b 100644 (file)
--- 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 && \

diff --git a/ci/containers/debian-11-cross-mipsel.Dockerfile b/ci/containers/debian-11-cross-mipsel.Dockerfile
index c41398f6e595c5b85aa2612ddb02523d1bfd23ef..eee3c9550f0bc9ee624782bd206dd7029d32da6e 100644 (file)
--- 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 && \

diff --git a/ci/containers/debian-11-cross-ppc64le.Dockerfile b/ci/containers/debian-11-cross-ppc64le.Dockerfile
index ae17452b86a986f8140aa67cd0ec447d118b555e..fdde64a3c65165eb25bf51b249f4486fd8f07676 100644 (file)
--- 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 && \

diff --git a/ci/containers/debian-11-cross-s390x.Dockerfile b/ci/containers/debian-11-cross-s390x.Dockerfile
index b3242bfeccad663132ed8ef239f2bbda1ddc9b41..d5f59510a7cd58adf6acb43e9e828d7ef6ce9479 100644 (file)
--- 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 && \

diff --git a/ci/containers/debian-11.Dockerfile b/ci/containers/debian-11.Dockerfile
index 313e9f8e32d8bb555f420f1f128999e740f38b94..a5b1e2dba402c28fe93731d487375ef7d95c4fa0 100644 (file)
--- 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 \

diff --git a/ci/containers/debian-12-cross-aarch64.Dockerfile b/ci/containers/debian-12-cross-aarch64.Dockerfile
index b1df77f68653128114c93e32273adef5cecd81ac..11b2c4fc30d0f429b859ca18c1a6dd467f53f055 100644 (file)
--- 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 && \

diff --git a/ci/containers/debian-12-cross-armv6l.Dockerfile b/ci/containers/debian-12-cross-armv6l.Dockerfile
index 39326f84639028f33d3ccff69f7f1d95e4a19dce..44f13d45c9b7e4a36c4bfe882e9b257bd3addc72 100644 (file)
--- 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 && \

diff --git a/ci/containers/debian-12-cross-armv7l.Dockerfile b/ci/containers/debian-12-cross-armv7l.Dockerfile
index 2f5cba03dfa478bf6ebba624cab9041c141232b8..2c91ec59d6a43fd28cd408252bda178b7ee1e804 100644 (file)
--- 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 && \

diff --git a/ci/containers/debian-12-cross-i686.Dockerfile b/ci/containers/debian-12-cross-i686.Dockerfile
index 1241904b3b5315149aa1db32cbac28989f117e44..2b57133958562956ace5f6b0d3dd2c8bd5e53069 100644 (file)
--- 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 && \

diff --git a/ci/containers/debian-12-cross-mips64el.Dockerfile b/ci/containers/debian-12-cross-mips64el.Dockerfile
index dd7eeb23dbb1be3595f66c929246e5345c352131..e457d2949d00984e607771fc0bc8ba70ca5f271a 100644 (file)
--- 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 && \

diff --git a/ci/containers/debian-12-cross-mipsel.Dockerfile b/ci/containers/debian-12-cross-mipsel.Dockerfile
index b320afbecd11d4bd0e8e549552b7342219468e14..3a3483395d0d48065d94e36380df18bb6d1e0688 100644 (file)
--- 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 && \

diff --git a/ci/containers/debian-12-cross-ppc64le.Dockerfile b/ci/containers/debian-12-cross-ppc64le.Dockerfile
index 79a785ecc5c3ecfef440a8ac9d4c95d90ba1024f..aaac11b763ddf0a2dc556528aa96690be4c54311 100644 (file)
--- 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 && \

diff --git a/ci/containers/debian-12-cross-s390x.Dockerfile b/ci/containers/debian-12-cross-s390x.Dockerfile
index 37564b3bf860cd5360e3e6236dc217b9f1781d3e..59f00c769e81601f0bbb30289dfbcacd7bf21a60 100644 (file)
--- 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 && \

diff --git a/ci/containers/debian-12.Dockerfile b/ci/containers/debian-12.Dockerfile
index 8464b8ad9329e7c75544972200bcc11d527150c3..04fbf91e79d227c902c3bbeee994cdff9a65124e 100644 (file)
--- 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 \

diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/containers/debian-sid-cross-aarch64.Dockerfile
index c2670eba71afed55acfbb20cef9cd8dcbddb487f..b28de509d33be3155fe965784cfb9458e2818a52 100644 (file)
--- 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 && \

diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile
index eef19ab72c18c7c3baef5693cdd73a3946c6dba9..d348281c8f2113027a4b0b2d607bce0c5c6b40eb 100644 (file)
--- 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 && \

diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile
index 97c765bc7ae2140b508176e530c9a13f58e6aa56..a8e729bc1d3ee8a4a5ee8a613788cc3809d5797c 100644 (file)
--- 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 && \

diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile
index a6c90df0cc6cc94a419da7831546b823a6c0aef4..e780a00da38a6fe110bfa7544e8f21940f201a41 100644 (file)
--- 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 && \

diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile
index 5cc740fe89694e3213597df1137dff3f621bf624..eb6276d0583efb8bf9aac79d96083ce10a015f4c 100644 (file)
--- 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 && \

diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile
index 996dd596d0a9baf76b7354298f218a95394cd09e..7e179ce0fe03ee8371c0b9ffec181e3b139821fe 100644 (file)
--- 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 && \

diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile
index 757c9c4c3a78581ec9da6d2ff4db32a140d20c16..9db5210871089dad6035063cc9b3c06ca9024081 100644 (file)
--- 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 && \

diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile
index 7145c0fcb552da052305ced3183284d87aabacf1..3f9796249c55152c98aa45dcb12c66348b2da41e 100644 (file)
--- 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 \

diff --git a/ci/containers/fedora-37.Dockerfile b/ci/containers/fedora-37.Dockerfile
index 86ebc0f0270b04c5a48155aa6be3337bf5251296..5177f8db1adc1f48d136ec332dd4d1c63a2671b4 100644 (file)
--- 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 \

diff --git a/ci/containers/fedora-38-cross-mingw32.Dockerfile b/ci/containers/fedora-38-cross-mingw32.Dockerfile
index 27adb786586214a8ba76065e6113c80373614bfe..3e003177d0c48f482061ad9469ffc6db9f8c35e9 100644 (file)
--- 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 && \

diff --git a/ci/containers/fedora-38-cross-mingw64.Dockerfile b/ci/containers/fedora-38-cross-mingw64.Dockerfile
index 8d5a69f686c69edf72e8dce38113cf358bb15154..21a222ac3f60094ea7c9a6ddf0963d3bf3338542 100644 (file)
--- 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 && \

diff --git a/ci/containers/fedora-38.Dockerfile b/ci/containers/fedora-38.Dockerfile
index a47e4a484ebb50a37bf7419854bdced969d3459e..903f396899b5a7fab0543ef9689fb6c16ea1b760 100644 (file)
--- 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 \

diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
index 865fde2f8f87432d5b03280fa4d1c17dc9ee4c2d..8fa25795037dbb487e2ac3aa016d33a5f14927bc 100644 (file)
--- 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 && \

diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
index 0e1a23dbac4be3b2bf51c9cf218a8a4c322d5867..35aa4087f922c4b744c6c7031b2774d50ba00992 100644 (file)
--- 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 && \

diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile
index 72e7d856437fd7048783fc39665c40e12460e778..8d76cb4ae65e39435c41316f1cbea56eb61238c0 100644 (file)
--- 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 \

diff --git a/ci/containers/opensuse-leap-15.Dockerfile b/ci/containers/opensuse-leap-15.Dockerfile
index 748d76407519c1de3271868ed08cf0e94dcf2090..80074ba8a435dd7982c431a80cfe7fc394c34265 100644 (file)
--- 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"

diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile b/ci/containers/opensuse-tumbleweed.Dockerfile
index 691553e9beaec5d5893787bf5128c82f7dfc6cca..644f173ed1a8ac552cad4e5f5b65452ba3a609d9 100644 (file)
--- 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 \

diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile
index 25d787f50a20423fa3d837e3143b1a9e98dcdead..641f6f25551f88692584dc5d71135e5e8be698cd 100644 (file)
--- 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 \

diff --git a/ci/containers/ubuntu-2204.Dockerfile b/ci/containers/ubuntu-2204.Dockerfile
index 47b9c3d7f9ca9cd7b5c2e51b565e276976951012..2b0ba90bde283fabb726e13f8dbcda1560182f8e 100644 (file)
--- 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 \