From 61da02ee4318c5e2718fecf922b53e7bfee6d54c Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Fri, 17 Jan 2014 23:46:19 -0800 Subject: Update makefile to install from updated requirements files --- Makefile | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8cf1659a..db582ffc 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,15 @@ pylint: pyflakes: pyflakes $(PY_FILES) -test: +requirements: + @echo "Installing cloud-init dependencies..." + sudo pip install -r "$@.txt" -q + +test-requirements: + @echo "Installing cloud-init test dependencies..." + sudo pip install -r "$@.txt" -q + +test: requirements test-requirements @nosetests $(noseopts) tests/ check_version: @@ -36,8 +44,8 @@ check_version: 2to3 $(PY_FILES) clean: - rm -rf /var/log/cloud-init.log \ - /var/lib/cloud/ + rm -rf /var/log/cloud-init.log /var/lib/cloud/ + find . -type f -name "*.pyc" -delete yaml: @$(CWD)/tools/validate-yaml.py $(YAML_FILES) @@ -49,4 +57,5 @@ deb: ./packages/bddeb .PHONY: test pylint pyflakes 2to3 clean pep8 rpm deb yaml check_version +.PHONE: test-requirements requirements -- cgit v1.2.3