jandieman
/
searxng
mirror of https://github.com/searxng/searxng.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[mod] manage - use pyenv.activate where it makes sense 

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
This commit is contained in:
Markus Heiser 2021-09-17 15:31:09 +02:00
parent e5e322e8ed
commit 7a3a1cd115
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
manage
View File

@ -322,22 +322,26 @@ weblate.push.translations() {
} }
data.all() { data.all() {
data.languages ( set -e
data.useragents pyenv.activate
data.osm_keys_tags data.languages
build_msg DATA "update searx/data/ahmia_blacklist.txt" data.useragents
pyenv.cmd python searx_extra/update/update_ahmia_blacklist.py data.osm_keys_tags
build_msg DATA "update searx/data/wikidata_units.json" build_msg DATA "update searx/data/ahmia_blacklist.txt"
pyenv.cmd python searx_extra/update/update_wikidata_units.py python searx_extra/update/update_ahmia_blacklist.py
build_msg DATA "update searx/data/currencies.json" build_msg DATA "update searx/data/wikidata_units.json"
pyenv.cmd python searx_extra/update/update_currencies.py python searx_extra/update/update_wikidata_units.py
build_msg DATA "update searx/data/currencies.json"
python searx_extra/update/update_currencies.py
)
} }
data.languages() { data.languages() {
( set -e ( set -e
pyenv.activate
build_msg ENGINES "fetch languages .." build_msg ENGINES "fetch languages .."
pyenv.cmd python searx_extra/update/update_languages.py python searx_extra/update/update_languages.py
build_msg ENGINES "update update searx/languages.py" build_msg ENGINES "update update searx/languages.py"
build_msg DATA "update searx/data/engines_languages.json" build_msg DATA "update searx/data/engines_languages.json"
) )
@ -604,18 +608,19 @@ test.pylint() {
# shellcheck disable=SC2086 # shellcheck disable=SC2086
( set -e ( set -e
build_msg TEST "[pylint] \$PYLINT_FILES" build_msg TEST "[pylint] \$PYLINT_FILES"
pyenv.cmd python ${PYLINT_OPTIONS} ${PYLINT_VERBOSE} \ pyenv.activate
python ${PYLINT_OPTIONS} ${PYLINT_VERBOSE} \
--additional-builtins="${PYLINT_ADDITIONAL_BUILTINS_FOR_ENGINES}" \ --additional-builtins="${PYLINT_ADDITIONAL_BUILTINS_FOR_ENGINES}" \
"${PYLINT_FILES[@]}" "${PYLINT_FILES[@]}"
build_msg TEST "[pylint] searx/engines" build_msg TEST "[pylint] searx/engines"
pyenv.cmd python ${PYLINT_OPTIONS} ${PYLINT_VERBOSE} \ python ${PYLINT_OPTIONS} ${PYLINT_VERBOSE} \
--disable="${PYLINT_SEARX_DISABLE_OPTION}" \ --disable="${PYLINT_SEARX_DISABLE_OPTION}" \
--additional-builtins="${PYLINT_ADDITIONAL_BUILTINS_FOR_ENGINES}" \ --additional-builtins="${PYLINT_ADDITIONAL_BUILTINS_FOR_ENGINES}" \
searx/engines searx/engines
build_msg TEST "[pylint] searx tests" build_msg TEST "[pylint] searx tests"
pyenv.cmd python ${PYLINT_OPTIONS} ${PYLINT_VERBOSE} \ python ${PYLINT_OPTIONS} ${PYLINT_VERBOSE} \
--disable="${PYLINT_SEARX_DISABLE_OPTION}" \ --disable="${PYLINT_SEARX_DISABLE_OPTION}" \
--ignore=searx/engines \ --ignore=searx/engines \
searx tests searx tests
@ -644,9 +649,10 @@ test.unit() {
test.coverage() { test.coverage() {
build_msg TEST 'unit test coverage' build_msg TEST 'unit test coverage'
( set -e ( set -e
pyenv.cmd python -m nose2 -C --log-capture --with-coverage --coverage searx -s tests/unit pyenv.activate
pyenv.cmd coverage report python -m nose2 -C --log-capture --with-coverage --coverage searx -s tests/unit
pyenv.cmd coverage html coverage report
coverage html
) )
dump_return $? dump_return $?
} }