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

[Facundo Batista]

Incorporated the client that uses virtualenv.

Unmerged revisions

85. By Facundo Batista on 2018-04-04

Incorporated the client that uses virtualenv.

=== modified file 'Makefile'
--- Makefile	2017-04-22 21:07:36 +0000
+++ Makefile	2018-04-04 14:07:57 +0000
@@ -1,5 +1,5 @@
 # Copyright 2008-2015 Canonical
-# Copyright 2015-2016 Chicharreros (https://launchpad.net/~chicharreros)
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -107,11 +107,16 @@
 bootstrap:
 	cat dependencies.txt | sudo xargs apt-get install -y --no-install-recommends
 	cat dependencies-devel.txt | sudo xargs apt-get install -y --no-install-recommends
+	mkdir -p tmp
+
+venv:
+	virtualenv --system-site-packages $(ENV)
+	$(ENV)/bin/pip install -r requirements-devel.txt -r .sourcecode/magicicada-client/requirements.txt
 
 raw-test:
-	./test $(TESTFLAGS)
+	$(ENV)/bin/python ./test $(TESTFLAGS)
 
-test: lint sourcedeps clean version start-db start-base start-dbus raw-test stop
+test: sourcedeps clean venv lint version start-db start-base start-dbus raw-test stop
 
 ci-test:
 	$(MAKE) test TESTFLAGS="-1 $(TESTFLAGS)"
@@ -120,8 +125,6 @@
 	rm -rf tmp/* _trial_temp $(ENV)
 
 lint:
-	virtualenv $(ENV)
-	$(ENV)/bin/pip install flake8 rst2html5
 	$(ENV)/bin/flake8 --filename='*.py' --exclude='migrations' $(SRC_DIR)
 	dev-scripts/check_readme.sh
 
 
=== modified file 'config-manager.txt'
--- config-manager.txt	2018-03-20 19:21:27 +0000
+++ config-manager.txt	2018-04-04 14:07:57 +0000
@@ -25,5 +25,5 @@
 ./.sourcecode/dirspec                     ~ubuntuone-control-tower/dirspec/trunk;revno=14
 ./.sourcecode/django                      ~ubuntuone-pqm-team/django/stable;revno=17
 ./.sourcecode/u1sync                      ~facundo/u1sync/opensourcing;revno=10
-./.sourcecode/magicicada-client           ~chicharreros/magicicada-client/trunk;revno=1440
+./.sourcecode/magicicada-client           ~chicharreros/magicicada-client/trunk;revno=1442
 ./.sourcecode/magicicada-protocol         ~chicharreros/magicicada-protocol/trunk;revno=169
 
=== added file 'requirements-devel.txt'
--- requirements-devel.txt	1970-01-01 00:00:00 +0000
+++ requirements-devel.txt	2018-04-04 14:07:57 +0000
@@ -0,0 +1,2 @@
+flake8
+rst2html5