From 3bcb72c593f13915a81272778809dd8e71e2c7b7 Mon Sep 17 00:00:00 2001 From: Joshua Powers Date: Mon, 30 Jan 2017 11:24:45 -0700 Subject: Remove style checking during build and add latest style checks to tox - make check will no longer run the style checks, that way package builds wont fail on a style difference in versions of the style tools in that distro. - created style-check make file target to continue to run pep8 and pyflakes - added tox envs 'tip-pycodestyle' and 'tip-pyflakes' to run latest style checking. These are not enabled by default run of tox. LP: #1652329 --- Makefile | 5 ++++- tox.ini | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 18ec5680..5940ed7e 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,9 @@ CODE_VERSION=$(shell $(PYVER) -c "from cloudinit import version; print(version.v all: check -check: check_version pep8 $(pyflakes) test $(yaml) +check: check_version test $(yaml) + +style-check: pep8 $(pyflakes) pep8: @$(CWD)/tools/run-pep8 @@ -84,3 +86,4 @@ deb: .PHONY: test pyflakes pyflakes3 clean pep8 rpm deb yaml check_version .PHONY: pip-test-requirements pip-requirements clean_pyc unittest unittest3 +.PHONY: style-check diff --git a/tox.ini b/tox.ini index e79ea6aa..ca5d8b87 100644 --- a/tox.ini +++ b/tox.ini @@ -79,3 +79,11 @@ deps = jsonpatch==1.2 six==1.9.0 -r{toxinidir}/test-requirements.txt + +[testenv:tip-pycodestyle] +commands = {envpython} -m pycodestyle {posargs:cloudinit/ tests/ tools/} +deps = pycodestyle + +[testenv:tip-pyflakes] +commands = {envpython} -m pyflakes {posargs:cloudinit/ tests/ tools/} +deps = pyflakes -- cgit v1.2.3