From d5bc7a694212c6a865323c7330cb3fe351dc20fc Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 9 Apr 2025 11:35:27 +0200
Subject: [PATCH 1/3] let pylint choose how many CPUs to use

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index bd209935..dff214c5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -78,7 +78,7 @@ disable_error_code = "no-redef, misc, arg-type"
 # Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the
 # number of processors available to use, and will cap the count on Windows to
 # avoid hangs.
-jobs = 4
+jobs = 0
 
 # Minimum Python version to use for version dependent checks. Will default to the
 # version used to run pylint.

From e1a8e1a08a134ef528438e3a40df0f897e2ac38a Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 9 Apr 2025 11:39:43 +0200
Subject: [PATCH 2/3] pylint: use default good-names list

---
 pyproject.toml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index dff214c5..0199f037 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -87,10 +87,6 @@ py-version = "3.9"
 # Files or directories to be skipped. They should be base names, not paths.
 ignore = ["apksigcopier.py", "looseversion.py"]
 
-[tool.pylint.basic]
-# Good variable names which should always be accepted, separated by a comma.
-good-names = ["i", "j", "k", "ex", "Run", "f", "fp"]
-
 [tool.pylint."messages control"]
 # Only show warnings with the listed confidence levels. Leave empty to show all.
 # Valid levels: HIGH, CONTROL_FLOW, INFERENCE, INFERENCE_FAILURE, UNDEFINED.

From 8c14e44f63659b19961292bd5698813f46025c98 Mon Sep 17 00:00:00 2001
From: linsui <2873532-linsui@users.noreply.gitlab.com>
Date: Wed, 9 Apr 2025 11:41:42 +0200
Subject: [PATCH 3/3] gitlab-ci: show pylint output in log when it fails

---
 .gitlab-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b8b49c27..d7dca64d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -268,13 +268,12 @@ pylint:
   script:
     - apt-get install pylint python3-pip
     - $pip install --break-system-packages pylint-gitlab
-    - pylint --output-format=pylint_gitlab.GitlabCodeClimateReporter
+    - pylint --output-format=colorized,pylint_gitlab.GitlabCodeClimateReporter:pylint-report.json
             fdroid
             makebuildserver
             setup.py
             fdroidserver/*.py
             tests/*.py
-            > pylint-report.json
   artifacts:
     reports:
       codequality: pylint-report.json