diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-03-03 14:26:00 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-03-03 14:26:00 -0500 |
| commit | 42d3efe69caeb2bb1ebdd67f1bae3e8f2134ff85 (patch) | |
| tree | 31f921f29748fb79b961c5256f5eea3f92bc7b1c /Makefile | |
| parent | 97efb9d48197d7098f1abe2ee519418afbe6aec5 (diff) | |
| parent | 112d25e6b2a20e8e39c1f22f6a30e0130616c64f (diff) | |
| download | vyos-cloud-init-42d3efe69caeb2bb1ebdd67f1bae3e8f2134ff85.tar.gz vyos-cloud-init-42d3efe69caeb2bb1ebdd67f1bae3e8f2134ff85.zip | |
fix pyflakes reported issues, and run it during package build and tox.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -1,6 +1,7 @@ CWD=$(shell pwd) PY_FILES=$(shell find cloudinit bin tests tools -name "*.py" -type f ) PY_FILES+="bin/cloud-init" +noseopts ?= -v YAML_FILES=$(shell find cloudinit bin tests tools -name "*.yaml" -type f ) YAML_FILES+=$(shell find doc/examples -name "cloud-config*.txt" -type f ) @@ -14,13 +15,15 @@ ifeq ($(distro),) distro = redhat endif -all: test check_version +all: check + +check: test check_version pyflakes pep8: @$(CWD)/tools/run-pep8 $(PY_FILES) pyflakes: - @$(CWD)/tools/tox-venv py34 pyflakes $(PY_FILES) + @pyflakes $(PY_FILES) pip-requirements: @echo "Installing cloud-init dependencies..." @@ -31,8 +34,7 @@ pip-test-requirements: $(PIP_INSTALL) -r "$@.txt" -q test: clean_pyc - @echo "Running tests..." - @nosetests $(noseopts) tests/ + @n=$$(which nosetests3) || n=nosetests; set -- $$n $(noseopts) tests/; echo "Running $$*"; "$$@" check_version: @if [ "$(CHANGELOG_VERSION)" != "$(CODE_VERSION)" ]; then \ |