From ec72c9da103153d04ab0d73d89aa5db6d46c3ac8 Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Fri, 8 Feb 2019 10:20:51 +0100 Subject: [PATCH 1/2] Fix accidental regression in pylint Makefile check. It looks like a couple of lines were accidentely removed in dc2617040d637fb4857b16ac1c40d9ef60c71830 and since then we didn't perform any pylint checks on StackStorm components and runners code. --- Makefile | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Makefile b/Makefile index cb55347027..3ed676de67 100644 --- a/Makefile +++ b/Makefile @@ -179,6 +179,19 @@ configgen: requirements .configgen @echo "================== pylint ====================" @echo # Lint st2 components + @for component in $(COMPONENTS); do\ + echo "==========================================================="; \ + echo "Running pylint on" $$component; \ + echo "==========================================================="; \ + $(VIRTUALENV_DIR)/bin/pylint -j $(PYLINT_CONCURRENCY) -E --rcfile=./lint-configs/python/.pylintrc --load-plugins=pylint_plugins.api_models --load-plugins=pylint_plugins.db_models $$component/$$component || exit 1; \ + done + # Lint runner modules and packages + @for component in $(COMPONENTS_RUNNERS); do\ + echo "==========================================================="; \ + echo "Running pylint on" $$component; \ + echo "==========================================================="; \ + $(VIRTUALENV_DIR)/bin/pylint -j $(PYLINT_CONCURRENCY) -E --rcfile=./lint-configs/python/.pylintrc --load-plugins=pylint_plugins.api_models --load-plugins=pylint_plugins.db_models $$component/*.py || exit 1; \ + done # Lint Python pack management actions . $(VIRTUALENV_DIR)/bin/activate; pylint -j $(PYLINT_CONCURRENCY) -E --rcfile=./lint-configs/python/.pylintrc --load-plugins=pylint_plugins.api_models contrib/packs/actions/*.py || exit 1; . $(VIRTUALENV_DIR)/bin/activate; pylint -j $(PYLINT_CONCURRENCY) -E --rcfile=./lint-configs/python/.pylintrc --load-plugins=pylint_plugins.api_models contrib/packs/actions/*/*.py || exit 1; From 049d83597452be6db17b863551d37205f1746f99 Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Sun, 10 Feb 2019 11:51:14 +0100 Subject: [PATCH 2/2] Fix syntax so PYTHONPATH is set correctly. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3ed676de67..bfee75c1a8 100644 --- a/Makefile +++ b/Makefile @@ -183,14 +183,14 @@ configgen: requirements .configgen echo "==========================================================="; \ echo "Running pylint on" $$component; \ echo "==========================================================="; \ - $(VIRTUALENV_DIR)/bin/pylint -j $(PYLINT_CONCURRENCY) -E --rcfile=./lint-configs/python/.pylintrc --load-plugins=pylint_plugins.api_models --load-plugins=pylint_plugins.db_models $$component/$$component || exit 1; \ + . $(VIRTUALENV_DIR)/bin/activate ; pylint -j $(PYLINT_CONCURRENCY) -E --rcfile=./lint-configs/python/.pylintrc --load-plugins=pylint_plugins.api_models --load-plugins=pylint_plugins.db_models $$component/$$component || exit 1; \ done # Lint runner modules and packages @for component in $(COMPONENTS_RUNNERS); do\ echo "==========================================================="; \ echo "Running pylint on" $$component; \ echo "==========================================================="; \ - $(VIRTUALENV_DIR)/bin/pylint -j $(PYLINT_CONCURRENCY) -E --rcfile=./lint-configs/python/.pylintrc --load-plugins=pylint_plugins.api_models --load-plugins=pylint_plugins.db_models $$component/*.py || exit 1; \ + . $(VIRTUALENV_DIR)/bin/activate ; pylint -j $(PYLINT_CONCURRENCY) -E --rcfile=./lint-configs/python/.pylintrc --load-plugins=pylint_plugins.api_models --load-plugins=pylint_plugins.db_models $$component/*.py || exit 1; \ done # Lint Python pack management actions . $(VIRTUALENV_DIR)/bin/activate; pylint -j $(PYLINT_CONCURRENCY) -E --rcfile=./lint-configs/python/.pylintrc --load-plugins=pylint_plugins.api_models contrib/packs/actions/*.py || exit 1;