diff options
| author | Tim Bielawa <tbielawa@redhat.com> | 2016-09-29 07:32:56 -0700 |
|---|---|---|
| committer | Tim Bielawa <tbielawa@redhat.com> | 2016-09-29 07:43:54 -0700 |
| commit | ba823255fcde17124b6dcc447bb00bc241346312 (patch) | |
| tree | f37bc298467beadf3e1d4a722702a346f14de75c /utils/Makefile | |
| parent | be3a68ae520d518daef2e35553c28cd150d3c344 (diff) | |
| download | openshift-ba823255fcde17124b6dcc447bb00bc241346312.tar.gz openshift-ba823255fcde17124b6dcc447bb00bc241346312.tar.bz2 openshift-ba823255fcde17124b6dcc447bb00bc241346312.tar.xz openshift-ba823255fcde17124b6dcc447bb00bc241346312.zip | |
Fix conflicts in spec file
Diffstat (limited to 'utils/Makefile')
| -rw-r--r-- | utils/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/utils/Makefile b/utils/Makefile index 078d6f184..59aff92fd 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -80,7 +80,7 @@ ci-pylint: @echo "#############################################" @echo "# Running PyLint Tests in virtualenv" @echo "#############################################" - . $(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 + . $(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 ../callback_plugins/openshift_quick_installer.py ci-list-deps: @echo "#############################################" @@ -93,12 +93,14 @@ ci-pyflakes: @echo "# Running Pyflakes Compliance Tests in virtualenv" @echo "#################################################" . $(NAME)env/bin/activate && pyflakes src/ooinstall/*.py + . $(NAME)env/bin/activate && pyflakes ../callback_plugins/openshift_quick_installer.py ci-pep8: @echo "#############################################" @echo "# Running PEP8 Compliance Tests in virtualenv" @echo "#############################################" . $(NAME)env/bin/activate && pep8 --ignore=E501,E121,E124 src/$(SHORTNAME)/ + . $(NAME)env/bin/activate && pep8 --ignore=E501,E121,E124 ../callback_plugins/openshift_quick_installer.py ci: clean virtualenv ci-list-deps ci-pep8 ci-pylint ci-pyflakes ci-unittests : |