From 542f7d0d7bd1a12e1884ba4a1508b40e2514d472 Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Mon, 11 Mar 2024 14:06:26 +0100
Subject: [mod] pylint all files with one profile / drop
 PYLINT_SEARXNG_DISABLE_OPTION

In the past, some files were tested with the standard profile, others with a
profile in which most of the messages were switched off ... some files were not
checked at all.

- ``PYLINT_SEARXNG_DISABLE_OPTION`` has been abolished
- the distinction ``# lint: pylint`` is no longer necessary
- the pylint tasks have been reduced from three to two

  1. ./searx/engines -> lint engines with additional builtins
  2. ./searx ./searxng_extra ./tests -> lint all other python files

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 utils/lib_sxng_test.sh | 18 +++++++-----------
 utils/searxng_check.py |  1 -
 2 files changed, 7 insertions(+), 12 deletions(-)

(limited to 'utils')

diff --git a/utils/lib_sxng_test.sh b/utils/lib_sxng_test.sh
index 1bba9aa4c..e0a4fe6f0 100755
--- a/utils/lib_sxng_test.sh
+++ b/utils/lib_sxng_test.sh
@@ -1,13 +1,11 @@
 #!/usr/bin/env bash
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
-[[ -z "${PYLINT_OPTIONS}" ]] &&  PYLINT_OPTIONS="-j 0 --rcfile .pylintrc"
-
 test.help(){
     cat <<EOF
 test.:
   yamllint  : lint YAML files (YAMLLINT_FILES)
-  pylint    : lint PYLINT_FILES, searx/engines, searx & tests
+  pylint    : lint ./searx, ./searxng_extra and ./tests
   pyright   : static type check of python sources
   black     : check black code format
   unit      : run unit tests
@@ -28,21 +26,19 @@ test.pylint() {
     # shellcheck disable=SC2086
     (   set -e
         pyenv.activate
+        PYLINT_OPTIONS="--rcfile .pylintrc"
 
-        build_msg TEST "[pylint] \$PYLINT_FILES"
-        pylint ${PYLINT_OPTIONS} ${PYLINT_VERBOSE} \
-            "${PYLINT_FILES[@]}"
-
-        build_msg TEST "[pylint] searx/engines"
+        build_msg TEST "[pylint] ./searx/engines"
         pylint ${PYLINT_OPTIONS} ${PYLINT_VERBOSE} \
             --additional-builtins="traits,supported_languages,language_aliases,logger,categories" \
             searx/engines
 
-        build_msg TEST "[pylint] searx tests"
+        build_msg TEST "[pylint] ./searx ./searxng_extra ./tests"
         pylint ${PYLINT_OPTIONS} ${PYLINT_VERBOSE} \
-            --disable="${PYLINT_SEARXNG_DISABLE_OPTION}" \
 	    --ignore=searx/engines \
-	    searx tests
+	    searx searx/searxng.msg \
+            searxng_extra searxng_extra/docs_prebuild \
+            tests
     )
     dump_return $?
 }
diff --git a/utils/searxng_check.py b/utils/searxng_check.py
index 3d2614fd4..0bff756ad 100644
--- a/utils/searxng_check.py
+++ b/utils/searxng_check.py
@@ -1,5 +1,4 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
-# lint: pylint
 """Implement some checks in the active installation
 """
 
-- 
cgit v1.2.3