From 7ad7bb5d29071857e6951783cc4a95d98b9bb277 Mon Sep 17 00:00:00 2001
From: Igor Sudak <isudak@cloudlinux.com>
Date: Thu, 18 Apr 2024 19:40:24 +0000
Subject: [PATCH] Several improvements

- The preflight-summary GH workflow: don't post linter reports if they
  don't fit into the comment size limit
- Dockerfiles: remove pip's cache in `~/.cache/pip`
- Use `line length = 88 chars` for Pylint and Black
---
 .github/workflows/preflight-summary.yml | 10 ++++++----
 Dockerfile.celery                       |  2 +-
 Dockerfile.scheduler                    |  6 +++---
 pyproject.toml                          |  4 ++--
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/preflight-summary.yml b/.github/workflows/preflight-summary.yml
index e020513..d92742b 100644
--- a/.github/workflows/preflight-summary.yml
+++ b/.github/workflows/preflight-summary.yml
@@ -57,11 +57,13 @@ jobs:
             cat {pylint,black,isort,bandit}-report.md > linter-reports.md 2>/dev/null || true
             if [[ -s linter-reports.md ]]; then
               printf "### Linter reports\n"
-              # Max size of comments on GitHub is 64KB. If the reports > 54KB, don't post them
-              if [[ $(stat --format=%s linter-reports.md) -gt 55296 ]]; then
-                printf "The reports are too big to be posted here.\n"
-              else
+              # Max size of comments on GitHub is 64KB. Don't post reports if they don't fit.
+              if awk '{sum += $1} END {exit sum > (62*1024)}' \
+                  <<< $(stat --format=%s test-summary.md code-coverage-results.md linter-reports.md)
+              then
                 cat linter-reports.md
+              else
+                printf "The reports are too big to be posted here.\n"
               fi
             fi
 
diff --git a/Dockerfile.celery b/Dockerfile.celery
index 050fa9b..81eaa91 100644
--- a/Dockerfile.celery
+++ b/Dockerfile.celery
@@ -55,4 +55,4 @@ RUN <<EOT
   pip3 install -r celery.txt
 EOT
 
-RUN rm -f *.txt
+RUN rm -rf *.txt ~/.cache/pip
diff --git a/Dockerfile.scheduler b/Dockerfile.scheduler
index a745db5..e600271 100644
--- a/Dockerfile.scheduler
+++ b/Dockerfile.scheduler
@@ -1,4 +1,4 @@
-FROM almalinux:9 as alts-scheduler
+FROM almalinux:9-base as alts-scheduler
 
 RUN <<EOT
   set -ex
@@ -23,7 +23,7 @@ RUN <<EOT
   set -ex
   python3 -m ensurepip
   pip3 install -r scheduler.txt
-  rm -f *.txt
+  rm -rf *.txt ~/.cache/pip
 EOT
 
 ADD --chmod=755 https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh /
@@ -35,5 +35,5 @@ COPY requirements/tests.txt requirements-tests.txt
 RUN <<EOT
   set -ex
   pip3 install -r requirements-tests.txt
-  rm requirements-tests.txt
+  rm -rf requirements-tests.txt ~/.cache/pip
 EOT
diff --git a/pyproject.toml b/pyproject.toml
index 4546dcb..538e61a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,14 +3,14 @@ profile = "black"
 split_on_trailing_comma = true
 
 [tool.black]
-line-length = 120
+line-length = 88
 skip-string-normalization = true
 # see https://black.readthedocs.io/en/stable/the_black_code_style/future_style.html#preview-style
 preview = true
 enable-unstable-feature = ["hug_parens_with_braces_and_square_brackets"]
 
 [tool.pylint]
-max-line-length = 120
+max-line-length = 88
 
 # Minimum line length for functions/classes that require docstrings
 docstring-min-length = 50