diff options
| -rw-r--r-- | Makefile | 23 | ||||
| -rw-r--r-- | requirements.txt (renamed from Requires) | 0 | ||||
| -rw-r--r-- | test-requirements.txt | 6 | ||||
| -rw-r--r-- | test-requires | 1 | ||||
| -rwxr-xr-x | tools/read-dependencies | 4 |
5 files changed, 26 insertions, 8 deletions
@@ -8,6 +8,8 @@ YAML_FILES+=$(shell find doc/examples -name "cloud-config*.txt" -type f ) CHANGELOG_VERSION=$(shell $(CWD)/tools/read-version) CODE_VERSION=$(shell python -c "from cloudinit import version; print version.version_string()") +PIP_INSTALL := pip install + ifeq ($(distro),) distro = redhat endif @@ -23,7 +25,16 @@ pylint: pyflakes: pyflakes $(PY_FILES) -test: +pip-requirements: + @echo "Installing cloud-init dependencies..." + $(PIP_INSTALL) -r "$@.txt" -q + +pip-test-requirements: + @echo "Installing cloud-init test dependencies..." + $(PIP_INSTALL) -r "$@.txt" -q + +test: clean_pyc + @echo "Running tests..." @nosetests $(noseopts) tests/ check_version: @@ -32,12 +43,14 @@ check_version: "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 +62,4 @@ deb: ./packages/bddeb .PHONY: test pylint pyflakes 2to3 clean pep8 rpm deb yaml check_version - +.PHONY: pip-test-requirements pip-requirements clean_pyc diff --git a/Requires b/requirements.txt index 8f695c68..8f695c68 100644 --- a/Requires +++ b/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 |