summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile15
1 files changed, 8 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 12fe8bd8..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,15 +25,15 @@ pylint:
pyflakes:
pyflakes $(PY_FILES)
-requirements:
+pip-requirements:
@echo "Installing cloud-init dependencies..."
- sudo pip install -r "$@.txt" -q
+ $(PIP_INSTALL) -r "$@.txt" -q
-test-requirements:
+pip-test-requirements:
@echo "Installing cloud-init test dependencies..."
- sudo pip install -r "$@.txt" -q
+ $(PIP_INSTALL) -r "$@.txt" -q
-test: clean_pyc requirements test-requirements
+test: clean_pyc
@echo "Running tests..."
@nosetests $(noseopts) tests/
@@ -60,5 +62,4 @@ deb:
./packages/bddeb
.PHONY: test pylint pyflakes 2to3 clean pep8 rpm deb yaml check_version
-.PHONY: test-requirements requirements clean_pyc
-
+.PHONY: pip-test-requirements pip-requirements clean_pyc