cloud-init-dev team mailing list archive

[Joshua Harlow <harlowja@xxxxxxxxx>]

Joshua Harlow has proposed merging lp:~harlowja/cloud-init/requirement-tweaks into lp:cloud-init.

Requested reviews:
  cloud init development team (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~harlowja/cloud-init/requirement-tweaks/+merge/202191
-- 
https://code.launchpad.net/~harlowja/cloud-init/requirement-tweaks/+merge/202191
Your team cloud init development team is requested to review the proposed merge of lp:~harlowja/cloud-init/requirement-tweaks into lp:cloud-init.

=== modified file 'Makefile'
--- Makefile	2013-07-17 19:31:57 +0000
+++ Makefile	2014-01-18 07:50:37 +0000
@@ -23,7 +23,15 @@
 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: clean_pyc requirements test-requirements
 	@nosetests $(noseopts) tests/
 
 check_version:
@@ -32,12 +40,14 @@
 	    "not equal to code version $(CODE_VERSION)"; exit 2; \
 	    else true; fi
 
+clean_pyc:
+	@find . -type f -name "*.pyc" -delete
+
 2to3:
 	2to3 $(PY_FILES)
 
-clean:
-	rm -rf /var/log/cloud-init.log \
-		   /var/lib/cloud/
+clean: clean_pyc
+	rm -rf /var/log/cloud-init.log /var/lib/cloud/
 
 yaml:
 	@$(CWD)/tools/validate-yaml.py $(YAML_FILES)
@@ -49,4 +59,5 @@
 	./packages/bddeb
 
 .PHONY: test pylint pyflakes 2to3 clean pep8 rpm deb yaml check_version
+.PHONE: test-requirements requirements clean_pyc
 

=== renamed file 'Requires' => 'requirements.txt'
=== renamed file 'test-requires' => 'test-requirements.txt'
--- test-requires	2014-01-17 22:08:58 +0000
+++ test-requirements.txt	2014-01-18 07:50:37 +0000
@@ -1,1 +1,6 @@
 httpretty>=0.7.1
+mocker
+nose
+pep8
+pyflakes
+pylint

=== modified file 'tools/read-dependencies'
--- tools/read-dependencies	2013-09-11 17:27:40 +0000
+++ tools/read-dependencies	2014-01-18 07:50:37 +0000
@@ -19,10 +19,10 @@
          "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