Update makefile to install from updated requirements files

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 \
+	rm -rf /var/log/cloud-init.log /var/lib/cloud/
-		   /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
 

test-requirements.txt

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

test-requires

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

tools/read-dependencies

@@ -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