Merge ~doismellburning/turnip:feature/pip_args into turnip:master

[Kristian Glass]

Rename PIP_CACHE_ARGS to PIP_ARGS

PIP_CACHE_ARGS isn't just used for interacting with the pip cache,
it's currently used for all arguments including being the control
interface for pip verbosity.

Renaming it to PIP_ARGS reflects its general nature and broad usage.

[Colin Watson (cjwatson)]

review: Approve

diff --git a/Makefile b/Makefile
index 9661f70..689ea5e 100644
--- a/Makefile
+++ b/Makefile
@@ -12,9 +12,9 @@ VIRTUALENV := virtualenv
 
 DEPENDENCIES_URL := https://git.launchpad.net/~canonical-launchpad-branches/turnip/+git/dependencies
 
-PIP_CACHE_ARGS ?= -q
+PIP_ARGS ?= -q
 ifneq ($(PIP_SOURCE_DIR),)
-override PIP_CACHE_ARGS += --no-index --find-links=file://$(realpath $(PIP_SOURCE_DIR))/
+override PIP_ARGS += --no-index --find-links=file://$(realpath $(PIP_SOURCE_DIR))/
 endif
 
 # Create archives in labelled directories (e.g.
@@ -50,8 +50,8 @@ endif
 	 echo 'find_links = file://$(realpath $(PIP_SOURCE_DIR))/') \
 		>$(ENV)/.pydistutils.cfg
 	$(VIRTUALENV) --never-download $(ENV)
-	$(PIP) install $(PIP_CACHE_ARGS) -r bootstrap-requirements.txt
-	$(PIP) install $(PIP_CACHE_ARGS) -c requirements.txt \
+	$(PIP) install $(PIP_ARGS) -r bootstrap-requirements.txt
+	$(PIP) install $(PIP_ARGS) -c requirements.txt \
 		-e '.[test,deploy]'
 
 test: $(ENV)
@@ -85,7 +85,7 @@ run-pack: $(ENV)
 
 $(PIP_CACHE): $(ENV)
 	mkdir -p $(PIP_CACHE)
-	$(PIP) install $(PIP_CACHE_ARGS) -d $(PIP_CACHE) \
+	$(PIP) install $(PIP_ARGS) -d $(PIP_CACHE) \
 		-r bootstrap-requirements.txt \
 		-r requirements.txt