diff options
| author | Andrew Butcher <abutcher@afrolegs.com> | 2016-10-20 13:03:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-20 13:03:42 -0400 |
| commit | 1e943532d3f2ba47cbc028ee05eab683e5ffbc81 (patch) | |
| tree | 491f0638804f0f30cc204950746481381cb54509 /utils | |
| parent | a1d339084c40f2f33b41426ea61510172eebd231 (diff) | |
| parent | b5f46cdfd4e046ba4d895db5ec0f4d00a28e17f1 (diff) | |
| download | openshift-1e943532d3f2ba47cbc028ee05eab683e5ffbc81.tar.gz openshift-1e943532d3f2ba47cbc028ee05eab683e5ffbc81.tar.bz2 openshift-1e943532d3f2ba47cbc028ee05eab683e5ffbc81.tar.xz openshift-1e943532d3f2ba47cbc028ee05eab683e5ffbc81.zip | |
Merge pull request #2549 from tbielawa/check-cert-expiry
Cert Expiry for Cluster Ops
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/Makefile | 12 | ||||
| -rw-r--r-- | utils/test-requirements.txt | 1 |
2 files changed, 10 insertions, 3 deletions
diff --git a/utils/Makefile b/utils/Makefile index 59aff92fd..62f08f74b 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -31,6 +31,8 @@ ASCII2MAN = a2x -D $(dir $@) -d manpage -f manpage $< MANPAGES := docs/man/man1/atomic-openshift-installer.1 VERSION := 1.3 +PEPEXCLUDES := E501,E121,E124 + sdist: clean python setup.py sdist rm -fR $(SHORTNAME).egg-info @@ -80,7 +82,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 ../callback_plugins/openshift_quick_installer.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 ../roles/openshift_certificate_expiry/library/openshift_cert_expiry.py ci-list-deps: @echo "#############################################" @@ -94,13 +96,17 @@ ci-pyflakes: @echo "#################################################" . $(NAME)env/bin/activate && pyflakes src/ooinstall/*.py . $(NAME)env/bin/activate && pyflakes ../callback_plugins/openshift_quick_installer.py + . $(NAME)env/bin/activate && pyflakes ../roles/openshift_certificate_expiry/library/openshift_cert_expiry.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 + . $(NAME)env/bin/activate && pep8 --ignore=$(PEPEXCLUDES) src/$(SHORTNAME)/ + . $(NAME)env/bin/activate && pep8 --ignore=$(PEPEXCLUDES) ../callback_plugins/openshift_quick_installer.py +# This one excludes E402 because it is an ansible module and the +# boilerplate import statement is expected to be at the bottom + . $(NAME)env/bin/activate && pep8 --ignore=$(PEPEXCLUDES),E402 ../roles/openshift_certificate_expiry/library/openshift_cert_expiry.py ci: clean virtualenv ci-list-deps ci-pep8 ci-pylint ci-pyflakes ci-unittests : diff --git a/utils/test-requirements.txt b/utils/test-requirements.txt index f2216a177..af91ab6a7 100644 --- a/utils/test-requirements.txt +++ b/utils/test-requirements.txt @@ -9,3 +9,4 @@ flake8 PyYAML click backports.functools_lru_cache +pyOpenSSL |