summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-04-04 16:24:11 -0300
committerTomás Touceda <chiiph@leap.se>2014-04-04 16:24:11 -0300
commitb25f3ae5ecaa70abaf80edc62931b5980c14e637 (patch)
tree290162fc323925f043ea037a09a9b347b97b954f /pkg
parent77e4e1d037a8eb796553b3f28f31e4f4d1ccee84 (diff)
parentee170c64aacdc59043b0e620fc476c1e60a0a1e0 (diff)
Merge branch 'release-0.3.8'0.3.8
Diffstat (limited to 'pkg')
-rw-r--r--pkg/requirements.pip2
-rwxr-xr-xpkg/tools/with_venvwrapper.sh15
2 files changed, 16 insertions, 1 deletions
diff --git a/pkg/requirements.pip b/pkg/requirements.pip
index 1515204..8dd84bf 100644
--- a/pkg/requirements.pip
+++ b/pkg/requirements.pip
@@ -1,4 +1,4 @@
-leap.common>=0.3.0
+leap.common>=0.3.7
simplejson
requests
# if we bump the gnupg version, bump also the sanity check
diff --git a/pkg/tools/with_venvwrapper.sh b/pkg/tools/with_venvwrapper.sh
new file mode 100755
index 0000000..2622978
--- /dev/null
+++ b/pkg/tools/with_venvwrapper.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+#Wraps a command in a virtualenwrapper passed as first argument.
+#Example:
+#with_virtualenvwrapper.sh leap-bitmask ./run_tests.sh
+
+wd=`pwd`
+source `which virtualenvwrapper.sh`
+echo "Activating virtualenv " $1
+echo "------------------------------------"
+workon $1
+cd $wd
+echo "running version: " `pyver leap.keymanager`
+echo "soledad version: " `pyver leap.soledad.common`
+$2 $3 $4 $5