summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorMarkus Heiser <markus.heiser@darmarit.de>2025-07-16 17:47:57 +0200
committerMarkus Heiser <markus.heiser@darmarIT.de>2025-07-28 12:53:26 +0200
commitcd062d7349b857d25e54db91fd5821b1a4a2d004 (patch)
treeb81e0542735fc86ea2d25c016dfe0e55b0e0255e /utils
parent67e423edb25a3b565cd649a04ae73aa6446115d4 (diff)
[fix] don't install pyright twice and do some clean up
Pyright has been installed twice so far, once via `package.json` and once in the test script via `npx --no-install`. Separating the type checks in the CI and on the developer desktop is also not necessary. Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
Diffstat (limited to 'utils')
-rwxr-xr-xutils/lib_sxng_test.sh34
1 files changed, 3 insertions, 31 deletions
diff --git a/utils/lib_sxng_test.sh b/utils/lib_sxng_test.sh
index bd3e19651..a15358d53 100755
--- a/utils/lib_sxng_test.sh
+++ b/utils/lib_sxng_test.sh
@@ -6,8 +6,8 @@ test.help(){
test.:
yamllint : lint YAML files (YAMLLINT_FILES)
pylint : lint ./searx, ./searxng_extra and ./tests
- black : check black code format
- shfmt : check shfmt code format
+ pyright : check Python types
+ black : check Python code format
shfmt : check Shell script code format
unit : run unit tests
coverage : run unit tests with coverage
@@ -49,15 +49,12 @@ test.pylint() {
dump_return $?
}
-test.types.dev() {
+test.pyright() {
# use this pyright test for local tests in development / it suppress
# warnings related to intentional monkey patching but gives good hints where
# we need to work on SearXNG's typification.
- #
- # --> pyrightconfig.json
build_msg TEST "[pyright/types] static type check of python sources"
- build_msg TEST " --> typeCheckingMode: on"
node.env.dev
build_msg TEST "[pyright/types] suppress warnings related to intentional monkey patching"
@@ -75,31 +72,6 @@ test.types.dev() {
return 0
}
-test.types.ci() {
- # use this pyright test for CI / disables typeCheckingMode, needed as long
- # we do not have fixed all typification issues.
- #
- # --> pyrightconfig-ci.json
-
- build_msg TEST "[pyright] static type check of python sources"
- build_msg TEST " --> typeCheckingMode: off !!!"
- node.env.dev
-
- build_msg TEST "[pyright] suppress warnings related to intentional monkey patching"
- # We run Pyright in the virtual environment because pyright executes
- # "python" to determine the Python version.
- pyenv.cmd npx --no-install pyright -p pyrightconfig-ci.json \
- | grep -E '\.py:[0-9]+:[0-9]+'\
- | grep -v '/engines/.*.py.* - warning: "logger" is not defined'\
- | grep -v '/plugins/.*.py.* - error: "logger" is not defined'\
- | grep -v '/engines/.*.py.* - warning: "supported_languages" is not defined' \
- | grep -v '/engines/.*.py.* - warning: "language_aliases" is not defined' \
- | grep -v '/engines/.*.py.* - warning: "categories" is not defined'
- # ignore exit value from pyright
- # dump_return ${PIPESTATUS[0]}
- return 0
-}
-
test.black() {
build_msg TEST "[black] $BLACK_TARGETS"
pyenv.cmd black --check --diff "${BLACK_OPTIONS[@]}" "${BLACK_TARGETS[@]}"