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

---
 Makefile                | 15 ++++++++++++---
 Requires                | 33 ---------------------------------
 requirements.txt        | 33 +++++++++++++++++++++++++++++++++
 test-requirements.txt   |  6 ++++++
 test-requires           |  1 -
 tools/read-dependencies |  4 ++--
 6 files changed, 53 insertions(+), 39 deletions(-)
 delete mode 100644 Requires
 create mode 100644 requirements.txt
 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/Requires
deleted file mode 100644
index 8f695c68..00000000
--- a/Requires
+++ /dev/null
@@ -1,33 +0,0 @@
-# Pypi requirements for cloud-init to work
-
-# Used for untemplating any files or strings with parameters.
-cheetah
-
-# This is used for any pretty printing of tabular data.
-PrettyTable
-
-# This one is currently only used by the MAAS datasource. If that
-# datasource is removed, this is no longer needed
-oauth
-
-# This one is currently used only by the SmartOS datasource. If that
-# datasource is removed, this is no longer needed
-pyserial
-
-# This is only needed for places where we need to support configs in a manner
-# that the built-in config parser is not sufficent (ie
-# when we need to preserve comments, or do not have a top-level
-# section)...
-configobj
-
-# All new style configurations are in the yaml format
-pyyaml
-
-# The new main entrypoint uses argparse instead of optparse
-argparse
-
-# Requests handles ssl correctly!
-requests
-
-# For patching pieces of cloud-config together
-jsonpatch
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 00000000..8f695c68
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,33 @@
+# Pypi requirements for cloud-init to work
+
+# Used for untemplating any files or strings with parameters.
+cheetah
+
+# This is used for any pretty printing of tabular data.
+PrettyTable
+
+# This one is currently only used by the MAAS datasource. If that
+# datasource is removed, this is no longer needed
+oauth
+
+# This one is currently used only by the SmartOS datasource. If that
+# datasource is removed, this is no longer needed
+pyserial
+
+# This is only needed for places where we need to support configs in a manner
+# that the built-in config parser is not sufficent (ie
+# when we need to preserve comments, or do not have a top-level
+# section)...
+configobj
+
+# All new style configurations are in the yaml format
+pyyaml
+
+# The new main entrypoint uses argparse instead of optparse
+argparse
+
+# Requests handles ssl correctly!
+requests
+
+# For patching pieces of cloud-config together
+jsonpatch
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
-- 
cgit v1.2.3