diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-03-03 16:54:49 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-03-03 16:54:49 -0500 |
| commit | da39ad69e3ee240df7354eb2c2f33bdaba9194f6 (patch) | |
| tree | af3bbaf35c2bfad074c5136bffc92caebed8fd31 /Makefile | |
| parent | f4c25ab96c572e0a503bb211a11cd2641ac321a3 (diff) | |
| parent | b1046db66bbed6a063f218992449b8abfd1ae99b (diff) | |
| download | vyos-cloud-init-da39ad69e3ee240df7354eb2c2f33bdaba9194f6.tar.gz vyos-cloud-init-da39ad69e3ee240df7354eb2c2f33bdaba9194f6.zip | |
merge with trunk
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 \ |