summaryrefslogtreecommitdiffstats
path: root/utils/Makefile
diff options
context:
space:
mode:
authorTim Bielawa <tbielawa@redhat.com>2016-12-08 12:02:16 -0800
committerTim Bielawa <tbielawa@redhat.com>2016-12-09 07:25:24 -0800
commit8f5a4b9797dba039a12cad1a485477fae6e11688 (patch)
tree52861a1a134f29b4634e31d6cc4621289b7b1ae0 /utils/Makefile
parentce39c9084bc20df242bbbef3a2a5b1c8060cbe9d (diff)
downloadopenshift-8f5a4b9797dba039a12cad1a485477fae6e11688.tar.gz
openshift-8f5a4b9797dba039a12cad1a485477fae6e11688.tar.bz2
openshift-8f5a4b9797dba039a12cad1a485477fae6e11688.tar.xz
openshift-8f5a4b9797dba039a12cad1a485477fae6e11688.zip
Fixes to 'make ci'
* Fixed: A grep filter was capturing the actual pylint check rc's * Changed: pylint used to print out messages for locally-disabled and file-ignored items * Changed: pylint output format is now 'parseable' * Cleaned up: Pylint was emitting deprecation messages for 'required-attributes' and 'ignore-iface-methods'. They have been removed from the pylintrc file
Diffstat (limited to 'utils/Makefile')
-rw-r--r--utils/Makefile29
1 files changed, 15 insertions, 14 deletions
diff --git a/utils/Makefile b/utils/Makefile
index 49c61e115..b2648bb56 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -22,6 +22,7 @@
NAME := oo-install
+VENV := $(NAME)env
TESTPACKAGE := oo-install
SHORTNAME := ooinstall
@@ -39,7 +40,7 @@ clean:
@find . -type f -regex ".*\.py[co]$$" -delete
@find . -type f \( -name "*~" -or -name "#*" \) -delete
@rm -fR build dist rpm-build MANIFEST htmlcov .coverage cover ooinstall.egg-info oo-install
- @rm -fR $(NAME)env
+ @rm -fR $(VENV)
# To force a rebuild of the docs run 'touch' on any *.in file under
@@ -62,45 +63,45 @@ viewcover:
# Conditional virtualenv building strategy taken from this great post
# by Marcel Hellkamp:
# http://blog.bottlepy.org/2012/07/16/virtualenv-and-makefiles.html
-venv: oo-installenv/bin/activate
-oo-installenv/bin/activate: test-requirements.txt
+$(VENV): $(VENV)/bin/activate
+$(VENV)/bin/activate: test-requirements.txt
@echo "#############################################"
@echo "# Creating a virtualenv"
@echo "#############################################"
- test -d venv || virtualenv $(NAME)env
- . $(NAME)env/bin/activate && pip install setuptools==17.1.1
- . $(NAME)env/bin/activate && pip install -r test-requirements.txt
- touch $(NAME)env/bin/activate
+ test -d $(VENV) || virtualenv $(VENV)
+ . $(VENV)/bin/activate && pip install setuptools==17.1.1
+ . $(VENV)/bin/activate && pip install -r test-requirements.txt
+ touch $(VENV)/bin/activate
# If there are any special things to install do it here
-# . $(NAME)env/bin/activate && INSTALL STUFF
+# . $(VENV)/bin/activate && INSTALL STUFF
ci-unittests:
@echo "#############################################"
@echo "# Running Unit Tests in virtualenv"
@echo "#############################################"
- . $(NAME)env/bin/activate && python setup.py nosetests --cover-erase
+ . $(VENV)/bin/activate && python setup.py nosetests --cover-erase
@echo "VIEW CODE COVERAGE REPORT WITH 'xdg-open cover/index.html' or run 'make viewcover'"
ci-pylint:
@echo "#############################################"
@echo "# Running PyLint Tests in virtualenv"
@echo "#############################################"
- . $(NAME)env/bin/activate && python -m pylint --rcfile ../git/.pylintrc $(shell find ../ -name $(NAME)env -prune -o -name test -prune -o -name "*.py" -print) 2>&1 | grep -E -v '(locally-disabled|file-ignored)'
+ . $(VENV)/bin/activate && python -m pylint --rcfile ../git/.pylintrc $(shell find ../ -name $(VENV) -prune -o -name ooinstall.egg-info -prune -o -name test -prune -o -name "*.py" -print)
ci-list-deps:
@echo "#############################################"
@echo "# Listing all pip deps"
@echo "#############################################"
- . $(NAME)env/bin/activate && pip freeze
+ . $(VENV)/bin/activate && pip freeze
ci-flake8:
@echo "#############################################"
@echo "# Running Flake8 Compliance Tests in virtualenv"
@echo "#############################################"
- . $(NAME)env/bin/activate && flake8 --config=setup.cfg ../ --exclude="utils,../inventory"
- . $(NAME)env/bin/activate && python setup.py flake8
+ . $(VENV)/bin/activate && flake8 --config=setup.cfg ../ --exclude="utils,../inventory"
+ . $(VENV)/bin/activate && python setup.py flake8
-ci: venv ci-list-deps ci-unittests ci-flake8 ci-pylint
+ci: $(VENV) ci-list-deps ci-unittests ci-flake8 ci-pylint
@echo
@echo "##################################################################################"
@echo "VIEW CODE COVERAGE REPORT WITH 'xdg-open cover/index.html' or run 'make viewcover'"