diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-04-04 16:24:11 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-04-04 16:24:11 -0300 |
| commit | bd2977f293945074b503bf6b50a5173775f4e8e5 (patch) | |
| tree | a990c1110db68f0694fbcef5428eb0522cfdea39 /keymanager/pkg | |
| parent | d7b4feaf4fa6161cd56a8898fe519ddb0635eb72 (diff) | |
| parent | 134173211a259d28934e47135ee10c26669c3ff8 (diff) | |
Merge branch 'release-0.3.8'
Diffstat (limited to 'keymanager/pkg')
| -rw-r--r-- | keymanager/pkg/requirements.pip | 2 | ||||
| -rwxr-xr-x | keymanager/pkg/tools/with_venvwrapper.sh | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/keymanager/pkg/requirements.pip b/keymanager/pkg/requirements.pip index 1515204..8dd84bf 100644 --- a/keymanager/pkg/requirements.pip +++ b/keymanager/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/keymanager/pkg/tools/with_venvwrapper.sh b/keymanager/pkg/tools/with_venvwrapper.sh new file mode 100755 index 0000000..2622978 --- /dev/null +++ b/keymanager/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 |