Update makefile to install from updated requirements files

This commit is contained in:
Joshua Harlow 2014-01-17 23:46:19 -08:00
parent d70c190622
commit 01e9c38447
5 changed files with 20 additions and 6 deletions

View File

@ -23,7 +23,15 @@ pylint:
pyflakes: pyflakes:
pyflakes $(PY_FILES) 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/ @nosetests $(noseopts) tests/
check_version: check_version:
@ -36,8 +44,8 @@ check_version:
2to3 $(PY_FILES) 2to3 $(PY_FILES)
clean: clean:
rm -rf /var/log/cloud-init.log \ rm -rf /var/log/cloud-init.log /var/lib/cloud/
/var/lib/cloud/ find . -type f -name "*.pyc" -delete
yaml: yaml:
@$(CWD)/tools/validate-yaml.py $(YAML_FILES) @$(CWD)/tools/validate-yaml.py $(YAML_FILES)
@ -49,4 +57,5 @@ deb:
./packages/bddeb ./packages/bddeb
.PHONY: test pylint pyflakes 2to3 clean pep8 rpm deb yaml check_version .PHONY: test pylint pyflakes 2to3 clean pep8 rpm deb yaml check_version
.PHONE: test-requirements requirements

6
test-requirements.txt Normal file
View File

@ -0,0 +1,6 @@
httpretty>=0.7.1
mocker
nose
pep8
pyflakes
pylint

View File

@ -1 +0,0 @@
httpretty>=0.7.1

View File

@ -19,10 +19,10 @@ if ! find_root; then
"exist in the cloud-init root directory." "exist in the cloud-init root directory."
fi fi
REQUIRES="$ROOT_DIR/Requires" REQUIRES="$ROOT_DIR/requirements.txt"
if [ ! -e "$REQUIRES" ]; then if [ ! -e "$REQUIRES" ]; then
fail "Unable to find 'Requires' file located at '$REQUIRES'" fail "Unable to find 'requirements.txt' file located at '$REQUIRES'"
fi fi
# Filter out comments and empty lines # Filter out comments and empty lines