From 01e9c384477ca47a0795d90dd398d2e2127f412e Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@gmail.com>
Date: Fri, 17 Jan 2014 23:46:19 -0800
Subject: [PATCH] Update makefile to install from updated requirements files

---
 Makefile                     | 15 ++++++++++++---
 Requires => requirements.txt |  0
 test-requirements.txt        |  6 ++++++
 test-requires                |  1 -
 tools/read-dependencies      |  4 ++--
 5 files changed, 20 insertions(+), 6 deletions(-)
 rename Requires => requirements.txt (100%)
 create mode 100644 test-requirements.txt
 delete mode 100644 test-requires

diff --git a/Makefile b/Makefile
index 8cf1659a..db582ffc 100644
--- a/Makefile
+++ b/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 \
-		   /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
 
diff --git a/Requires b/requirements.txt
similarity index 100%
rename from Requires
rename to requirements.txt
diff --git a/test-requirements.txt b/test-requirements.txt
new file mode 100644
index 00000000..4be0211d
--- /dev/null
+++ b/test-requirements.txt
@@ -0,0 +1,6 @@
+httpretty>=0.7.1
+mocker
+nose
+pep8
+pyflakes
+pylint
diff --git a/test-requires b/test-requires
deleted file mode 100644
index 6cee1c44..00000000
--- a/test-requires
+++ /dev/null
@@ -1 +0,0 @@
-httpretty>=0.7.1
diff --git a/tools/read-dependencies b/tools/read-dependencies
index 3335f6a4..f89391bc 100755
--- a/tools/read-dependencies
+++ b/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