turnip

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

  1. Git
  2. lp:~doismellburning/turnip
  3. feature/pip_args
  4. Merge into master
Proposed by Kristian Glass
Status: Merged
Approved by: Colin Watson
Approved revision: 3f1d90886d6cbff6fe4dc90582b646dca407c3d8
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~doismellburning/turnip:feature/pip_args
Merge into: turnip:master
Diff against target: 35 lines (+5/-5)
1 file modified
Makefile (+5/-5)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+378318@code.launchpad.net

Commit message

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.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index 9661f70..689ea5e 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -12,9 +12,9 @@ VIRTUALENV := virtualenv
6
7 DEPENDENCIES_URL := https://git.launchpad.net/~canonical-launchpad-branches/turnip/+git/dependencies
8
9-PIP_CACHE_ARGS ?= -q
10+PIP_ARGS ?= -q
11 ifneq ($(PIP_SOURCE_DIR),)
12-override PIP_CACHE_ARGS += --no-index --find-links=file://$(realpath $(PIP_SOURCE_DIR))/
13+override PIP_ARGS += --no-index --find-links=file://$(realpath $(PIP_SOURCE_DIR))/
14 endif
15
16 # Create archives in labelled directories (e.g.
17@@ -50,8 +50,8 @@ endif
18 echo 'find_links = file://$(realpath $(PIP_SOURCE_DIR))/') \
19 >$(ENV)/.pydistutils.cfg
20 $(VIRTUALENV) --never-download $(ENV)
21- $(PIP) install $(PIP_CACHE_ARGS) -r bootstrap-requirements.txt
22- $(PIP) install $(PIP_CACHE_ARGS) -c requirements.txt \
23+ $(PIP) install $(PIP_ARGS) -r bootstrap-requirements.txt
24+ $(PIP) install $(PIP_ARGS) -c requirements.txt \
25 -e '.[test,deploy]'
26
27 test: $(ENV)
28@@ -85,7 +85,7 @@ run-pack: $(ENV)
29
30 $(PIP_CACHE): $(ENV)
31 mkdir -p $(PIP_CACHE)
32- $(PIP) install $(PIP_CACHE_ARGS) -d $(PIP_CACHE) \
33+ $(PIP) install $(PIP_ARGS) -d $(PIP_CACHE) \
34 -r bootstrap-requirements.txt \
35 -r requirements.txt
36

Subscribers

People subscribed via source and target branches