Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Introduce the fast_lint make target. #733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pirat89 merged 2 commits into from
Oct 11, 2021
Merged

Introduce the fast_lint make target. #733

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a007fd
Introduce the fast_lint make target.
Sep 27, 2021
9519fc3
Refactor lint and test targets.
Oct 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 26 additions & 12 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@ REQUEST=`if test -n "$$PR"; then echo ".PR$${PR}"; elif test -n "$$MR"; then ech
# 1.201810080027Z.4078402.master
RELEASE="$(N_REL).$(TIMESTAMP).$(SHORT_SHA).$(BRANCH)$(REQUEST)$(_SUFFIX)"

ifneq ($(shell id -u),0)
ENTER_VENV := . $(VENVNAME)/bin/activate;
else
ENTER_VENV :=
endif

all: help

help:
Expand Down Expand Up @@ -134,21 +140,29 @@ container-test:
docker run --rm -ti -v ${PWD}:/payload leapp-tests

test: lint
ifeq ($(shell id -u), 0)
pytest -vv --cov-report term-missing --cov=leapp tests/scripts
else
. $(VENVNAME)/bin/activate ; \
@ $(ENTER_VENV) \
pytest -vv --cov-report term-missing --cov=leapp tests/scripts
endif

lint:
ifeq ($(shell id -u), 0)
@ $(ENTER_VENV) \
pytest --cache-clear --pylint -m pylint leapp tests/scripts/*.py; \
pytest --cache-clear --flake8 -m flake8 leapp tests/scripts/*.py
else
. $(VENVNAME)/bin/activate ; \
pytest --cache-clear --pylint -m pylint leapp tests/scripts/*.py; \
pytest --cache-clear --flake8 -m flake8 leapp tests/scripts/*.py
endif

.PHONY: clean copr_build install install-deps install-test srpm test lint
fast_lint:
@ $(ENTER_VENV) \
FILES_TO_LINT="$$(git diff --name-only $(MASTER_BRANCH)| grep '\.py$$')"; \
if [[ -n "$$FILES_TO_LINT" ]]; then \
pylint -j 0 $$FILES_TO_LINT && \
flake8 $$FILES_TO_LINT; \
LINT_EXIT_CODE="$$?"; \
if [[ "$$LINT_EXIT_CODE" != "0" ]]; then \
exit $$LINT_EXIT_CODE; \
fi; \
if [[ "$(_PYTHON_VENV)" == "python2.7" ]] ; then \
pylint --py3k $$FILES_TO_LINT; \
fi; \
else \
echo "No files to lint."; \
fi

.PHONY: clean copr_build install install-deps install-test srpm test lint fast_lint