Commit 61da02ee authored by Joshua Harlow's avatar Joshua Harlow

Update makefile to install from updated requirements files

parent cbc5af73
......@@ -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
......@@ -19,10 +19,10 @@ if ! find_root; then
"exist in the cloud-init root directory."
fi
REQUIRES="$ROOT_DIR/Requires"
REQUIRES="$ROOT_DIR/requirements.txt"
if [ ! -e "$REQUIRES" ]; then
fail "Unable to find 'Requires' file located at '$REQUIRES'"
fail "Unable to find 'requirements.txt' file located at '$REQUIRES'"
fi
# Filter out comments and empty lines
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment