From 565493b57d3dbef94f4c298b7395e26fc24bb9bd Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Wed, 1 Apr 2020 15:45:01 +0200 Subject: travis: use Makefile target travis.codecov to install codecov fix travis build error [1]:: The command "local/py3/bin/pip install codecov" failed and exited with 127 Use the correct pip (python environment) from build environment:: $(PY_ENV_BIN)/python -m pip [1] https://travis-ci.org/github/asciimoo/searx/jobs/669701405#L590 Signed-off-by: Markus Heiser --- Makefile | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 65f79ba2c..7d5282802 100644 --- a/Makefile +++ b/Makefile @@ -220,4 +220,11 @@ test.clean: @echo "CLEAN intermediate test stuff" $(Q)rm -rf geckodriver.log .coverage coverage/ + +# travis +# ------ + +travis.codecov: + $(Q)$(PY_ENV_BIN)/python -m pip install codecov + .PHONY: $(PHONY) -- cgit v1.2.3 From fc89c698bd81a582b5ea7095de32a12d54a40268 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Wed, 1 Apr 2020 19:20:52 +0200 Subject: make test.pylint: do not run pylint checks in py2 Signed-off-by: Markus Heiser --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7d5282802..abd0eddb8 100644 --- a/Makefile +++ b/Makefile @@ -186,12 +186,17 @@ PHONY += test test.pylint test.pep8 test.unit test.coverage test.robot test: buildenv test.pylint test.pep8 test.unit gecko.driver test.robot +ifeq ($(PY),2) +test.pylint: + @echo "LINT skip liniting py2" +else # TODO: balance linting with pylint test.pylint: pyenvinstall $(call cmd,pylint,\ searx/preferences.py \ searx/testing.py \ ) +endif # ignored rules: # E402 module level import not at top of file -- cgit v1.2.3