summaryrefslogtreecommitdiffstats
path: root/utils/Makefile
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@afrolegs.com>2016-09-01 13:47:37 -0400
committerGitHub <noreply@github.com>2016-09-01 13:47:37 -0400
commit84c220e5e68fa8ead1f15b9af928c42c12ce853b (patch)
treed40d6b80f152ef65ae4efbf1fca1cbc7780fd266 /utils/Makefile
parent55683a581ab891e293c5a34c074c324009f1ba37 (diff)
parent54a494e0948c270a66b63dc9420d38bb5b68ff54 (diff)
downloadopenshift-84c220e5e68fa8ead1f15b9af928c42c12ce853b.tar.gz
openshift-84c220e5e68fa8ead1f15b9af928c42c12ce853b.tar.bz2
openshift-84c220e5e68fa8ead1f15b9af928c42c12ce853b.tar.xz
openshift-84c220e5e68fa8ead1f15b9af928c42c12ce853b.zip
Merge pull request #2367 from tbielawa/FixNewerPyLintErrors
Fix PyLint errors discovered when upgrading to newer version
Diffstat (limited to 'utils/Makefile')
-rw-r--r--utils/Makefile14
1 files changed, 8 insertions, 6 deletions
diff --git a/utils/Makefile b/utils/Makefile
index dd0b5cdd0..79c27626a 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -35,14 +35,16 @@ clean:
@rm -fR build dist rpm-build MANIFEST htmlcov .coverage cover ooinstall.egg-info oo-install
@rm -fR $(NAME)env
+viewcover:
+ xdg-open cover/index.html
+
virtualenv:
@echo "#############################################"
@echo "# Creating a virtualenv"
@echo "#############################################"
virtualenv $(NAME)env
- . $(NAME)env/bin/activate && pip install -r requirements.txt
- . $(NAME)env/bin/activate && pip install pep8 nose coverage mock flake8 PyYAML click
-
+ . $(NAME)env/bin/activate && pip install setuptools==17.1.1
+ . $(NAME)env/bin/activate && pip install -r test-requirements.txt
# If there are any special things to install do it here
# . $(NAME)env/bin/activate && INSTALL STUFF
@@ -50,14 +52,14 @@ ci-unittests:
@echo "#############################################"
@echo "# Running Unit Tests in virtualenv"
@echo "#############################################"
-# . $(NAME)env/bin/activate && nosetests -v --with-cover --cover-html --cover-min-percentage=80 --cover-package=$(TESTPACKAGE) test/
- . $(NAME)env/bin/activate && nosetests -v test/
+ . $(NAME)env/bin/activate && nosetests -v --with-coverage --cover-html --cover-min-percentage=70 --cover-package=$(SHORTNAME) test/
+ @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 "#############################################"
- python -m pylint --rcfile ../git/.pylintrc src/ooinstall/cli_installer.py src/ooinstall/oo_config.py src/ooinstall/openshift_ansible.py src/ooinstall/variants.py
+ . $(NAME)env/bin/activate && python -m pylint --rcfile ../git/.pylintrc src/ooinstall/cli_installer.py src/ooinstall/oo_config.py src/ooinstall/openshift_ansible.py src/ooinstall/variants.py
ci-list-deps:
@echo "#############################################"