summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@gmail.com>2014-01-20 13:50:04 -0500
committerScott Moser <smoser@ubuntu.com>2014-01-20 13:50:04 -0500
commitb2ebae64a7b9738db6c6408cee4adc2bf2f178de (patch)
tree4d3ed7c28b8c775710f75e002d239b49a6731904 /Makefile
parentcbc5af7396743e014f1ad9ece0bb56820d26f484 (diff)
parent5f3bb991ac48e31075e32167efa9aad74cdc1296 (diff)
downloadvyos-cloud-init-b2ebae64a7b9738db6c6408cee4adc2bf2f178de.tar.gz
vyos-cloud-init-b2ebae64a7b9738db6c6408cee4adc2bf2f178de.zip
merge requirement changes
This splits up 'Requires' into requirements.txt and test-requirements.txt to differenciate the build dependencies and runtime dependencies. one sticky thing still exists in that the packages/bddeb doesn't: - list any Build-Depends - address versions in the requirements.txt
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile23
1 files changed, 18 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 8cf1659a..c8b75e73 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,8 @@ YAML_FILES+=$(shell find doc/examples -name "cloud-config*.txt" -type f )
CHANGELOG_VERSION=$(shell $(CWD)/tools/read-version)
CODE_VERSION=$(shell python -c "from cloudinit import version; print version.version_string()")
+PIP_INSTALL := pip install
+
ifeq ($(distro),)
distro = redhat
endif
@@ -23,7 +25,16 @@ pylint:
pyflakes:
pyflakes $(PY_FILES)
-test:
+pip-requirements:
+ @echo "Installing cloud-init dependencies..."
+ $(PIP_INSTALL) -r "$@.txt" -q
+
+pip-test-requirements:
+ @echo "Installing cloud-init test dependencies..."
+ $(PIP_INSTALL) -r "$@.txt" -q
+
+test: clean_pyc
+ @echo "Running tests..."
@nosetests $(noseopts) tests/
check_version:
@@ -32,12 +43,14 @@ check_version:
"not equal to code version $(CODE_VERSION)"; exit 2; \
else true; fi
+clean_pyc:
+ @find . -type f -name "*.pyc" -delete
+
2to3:
2to3 $(PY_FILES)
-clean:
- rm -rf /var/log/cloud-init.log \
- /var/lib/cloud/
+clean: clean_pyc
+ rm -rf /var/log/cloud-init.log /var/lib/cloud/
yaml:
@$(CWD)/tools/validate-yaml.py $(YAML_FILES)
@@ -49,4 +62,4 @@ deb:
./packages/bddeb
.PHONY: test pylint pyflakes 2to3 clean pep8 rpm deb yaml check_version
-
+.PHONY: pip-test-requirements pip-requirements clean_pyc