[Pkg-mozext-commits] [requestpolicy] 48/80: create a separate venv for mozmill

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository requestpolicy.

commit f0df68b45196e6f72780d8e4628e9279d5a47b0b
Author: Martin Kimmerle <dev at 256k.de>
Date:   Thu Jun 18 03:01:24 2015 +0200

    create a separate venv for mozmill
---
 Makefile | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 780b824..02bef91 100644
--- a/Makefile
+++ b/Makefile
@@ -415,7 +415,7 @@ $(deleted_files): FORCE
 # for running and unit-testing
 #
 
-.PHONY: venv
+.PHONY: venv venv-mozmill
 
 venv: .venv/bin/activate
 .venv/bin/activate: requirements.txt
@@ -429,6 +429,17 @@ venv: .venv/bin/activate
 	touch --no-create .venv/bin/activate ; \
 	)
 
+# mozmill needs a separate venv
+#   ( because it uses '==' package dependencies instead of '>='
+#     see https://github.com/mozilla/mozmill/blob/2.0.10/mozmill/setup.py#L11 )
+venv-mozmill: .venv-mozmill/bin/activate
+.venv-mozmill/bin/activate:
+	test -d .venv-mozmill || virtualenv --prompt='(RP/mozmill)' .venv-mozmill
+	( \
+	source .venv-mozmill/bin/activate ; \
+	pip install mozmill ; \
+	)
+
 # ___________
 # run firefox
 #
@@ -463,9 +474,12 @@ mm_manifest := manifest.ini
 .PHONY: check test mozmill marionette mozmill-dirs
 check test: mozmill marionette
 
-mozmill: $(moz_xpi) $(dev_helper__xpi_file) mozmill-dirs
+mozmill: venv-mozmill $(moz_xpi) $(dev_helper__xpi_file) mozmill-dirs
+	( \
+	source .venv/bin/activate ; \
 	mozmill -a $(moz_xpi) -a $(dev_helper__xpi_file) -b $(app_binary) \
-		-m $(mozmill_rpc_test_dir)/$(mm_manifest) $(moz_args)
+		-m $(mozmill_rpc_test_dir)/$(mm_manifest) $(moz_args) ; \
+	)
 
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git