From cc1ed78064f53f63ac0f6e67c96e5dac3f2a2ad7 Mon Sep 17 00:00:00 2001
From: Serge Bazanski <q3k@q3k.org>
Date: Thu, 20 Jul 2023 22:30:50 +0200
Subject: [PATCH] ci: run black
---
.gitlab-ci.yml | 2 +-
nix/docker-image.nix | 7 ++++++-
nix/pkgs.nix | 1 +
tools/format.sh | 7 +++++++
4 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3197845daa..cf3ff71f12 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ variables:
default:
# built via:
# docker load < $(nix-build nix/docker-image.nix)
- image: registry.k0.hswaw.net/q3k/flow3r-build:xm5xqlpswrnav5pi36qjphyg8v7gplik
+ image: registry.k0.hswaw.net/q3k/flow3r-build:kvy1jakg8i4jxx4skhpy6si3vvslsgrb
clang-tidy:
stage: check
diff --git a/nix/docker-image.nix b/nix/docker-image.nix
index da6daa138c..8f557176c3 100644
--- a/nix/docker-image.nix
+++ b/nix/docker-image.nix
@@ -18,8 +18,13 @@ pkgs.dockerTools.buildImage {
mypy
+ (python3.withPackages (ps: with ps; [
+ sphinx sphinx_rtd_theme
+ black
+ ]))
+
# random build tools
- python3 gcc gnused findutils gnugrep
+ gcc gnused findutils gnugrep
git wget gnumake
cmake ninja pkgconfig
];
diff --git a/nix/pkgs.nix b/nix/pkgs.nix
index 4e457dd2a6..41a2b3d72d 100644
--- a/nix/pkgs.nix
+++ b/nix/pkgs.nix
@@ -24,6 +24,7 @@ in with nixpkgs; rec {
python3Packages.sphinx
python3Packages.sphinx_rtd_theme
+ python3Packages.black
mypy
];
fwdev = fwbuild ++ [
diff --git a/tools/format.sh b/tools/format.sh
index 6f3da1cc7c..2f496d74f3 100755
--- a/tools/format.sh
+++ b/tools/format.sh
@@ -1,6 +1,13 @@
#!/usr/bin/env bash
set -e -x
+# Python: black
+black \
+ python_payload \
+ sim \
+ tools
+
+# C: clang-format
find . \
-type d \
\( \
--
GitLab