summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@gmail.com>2014-01-17 23:46:19 -0800
committerJoshua Harlow <harlowja@gmail.com>2014-01-17 23:46:19 -0800
commit61da02ee4318c5e2718fecf922b53e7bfee6d54c (patch)
treea8e532a5941bd9d9d323f67f17f35431255868a4 /Makefile
parentcbc5af7396743e014f1ad9ece0bb56820d26f484 (diff)
downloadcloud-init-git-61da02ee4318c5e2718fecf922b53e7bfee6d54c.tar.gz
Update makefile to install from updated requirements files
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile15
1 files changed, 12 insertions, 3 deletions
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