Merge ~michael.nelson/gpgservice:avoid-pip-issue-1773 into gpgservice:master

Proposed by Michael Nelson
Status: Merged
Approved by: Michael Nelson
Approved revision: 163911a90b79d58cca294b60ef524791092559f1
Merged at revision: 163911a90b79d58cca294b60ef524791092559f1
Proposed branch: ~michael.nelson/gpgservice:avoid-pip-issue-1773
Merge into: gpgservice:master
Diff against target: 12 lines (+1/-1)
1 file modified
Makefile (+1/-1)
Reviewer Review Type Date Requested Status
Ubuntu One hackers Pending
Review via email: mp+283567@code.launchpad.net

Commit message

Don't use env/bin/pip due to https://github.com/pypa/pip/issues/1773 .

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index 8772196..22c6321 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -1,6 +1,6 @@
6 ENV = $(CURDIR)/env
7 PYTHON = $(ENV)/bin/python
8-PIP = $(ENV)/bin/pip
9+PIP = $(PYTHON) -m pip
10 FLAKE8 = $(ENV)/bin/flake8
11 TWISTD_PATH = $(ENV)/bin/twistd
12 TMPDIR = $(CURDIR)/tmp

Subscribers

People subscribed via source and target branches