Merge lp:~facundo/magicicada-server/incorporate-client-with-venv into lp:magicicada-server

Proposed by Facundo Batista on 2018-04-04
Status: Rejected
Rejected by: Facundo Batista on 2018-04-04
Proposed branch: lp:~facundo/magicicada-server/incorporate-client-with-venv
Merge into: lp:magicicada-server
Diff against target: 56 lines (+11/-6)
3 files modified
Makefile (+8/-5)
config-manager.txt (+1/-1)
requirements-devel.txt (+2/-0)
To merge this branch: bzr merge lp:~facundo/magicicada-server/incorporate-client-with-venv
Reviewer Review Type Date Requested Status
chicharreros 2018-04-04 Pending
Review via email: mp+342650@code.launchpad.net

Commit message

Incorporated the client that uses virtualenv.

To post a comment you must log in.

Unmerged revisions

85. By Facundo Batista on 2018-04-04

Incorporated the client that uses virtualenv.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2017-04-22 21:07:36 +0000
3+++ Makefile 2018-04-04 14:07:57 +0000
4@@ -1,5 +1,5 @@
5 # Copyright 2008-2015 Canonical
6-# Copyright 2015-2016 Chicharreros (https://launchpad.net/~chicharreros)
7+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
8 #
9 # This program is free software: you can redistribute it and/or modify
10 # it under the terms of the GNU Affero General Public License as
11@@ -107,11 +107,16 @@
12 bootstrap:
13 cat dependencies.txt | sudo xargs apt-get install -y --no-install-recommends
14 cat dependencies-devel.txt | sudo xargs apt-get install -y --no-install-recommends
15+ mkdir -p tmp
16+
17+venv:
18+ virtualenv --system-site-packages $(ENV)
19+ $(ENV)/bin/pip install -r requirements-devel.txt -r .sourcecode/magicicada-client/requirements.txt
20
21 raw-test:
22- ./test $(TESTFLAGS)
23+ $(ENV)/bin/python ./test $(TESTFLAGS)
24
25-test: lint sourcedeps clean version start-db start-base start-dbus raw-test stop
26+test: sourcedeps clean venv lint version start-db start-base start-dbus raw-test stop
27
28 ci-test:
29 $(MAKE) test TESTFLAGS="-1 $(TESTFLAGS)"
30@@ -120,8 +125,6 @@
31 rm -rf tmp/* _trial_temp $(ENV)
32
33 lint:
34- virtualenv $(ENV)
35- $(ENV)/bin/pip install flake8 rst2html5
36 $(ENV)/bin/flake8 --filename='*.py' --exclude='migrations' $(SRC_DIR)
37 dev-scripts/check_readme.sh
38
39
40=== modified file 'config-manager.txt'
41--- config-manager.txt 2018-03-20 19:21:27 +0000
42+++ config-manager.txt 2018-04-04 14:07:57 +0000
43@@ -25,5 +25,5 @@
44 ./.sourcecode/dirspec ~ubuntuone-control-tower/dirspec/trunk;revno=14
45 ./.sourcecode/django ~ubuntuone-pqm-team/django/stable;revno=17
46 ./.sourcecode/u1sync ~facundo/u1sync/opensourcing;revno=10
47-./.sourcecode/magicicada-client ~chicharreros/magicicada-client/trunk;revno=1440
48+./.sourcecode/magicicada-client ~chicharreros/magicicada-client/trunk;revno=1442
49 ./.sourcecode/magicicada-protocol ~chicharreros/magicicada-protocol/trunk;revno=169
50
51=== added file 'requirements-devel.txt'
52--- requirements-devel.txt 1970-01-01 00:00:00 +0000
53+++ requirements-devel.txt 2018-04-04 14:07:57 +0000
54@@ -0,0 +1,2 @@
55+flake8
56+rst2html5

Subscribers

People subscribed via source and target branches

to all changes: