diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-12-06 15:43:23 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-12-06 15:43:23 -0300 |
| commit | deb78a5f3502ece98ec3e0b70f93025c4a1b3da5 (patch) | |
| tree | abb188c846482e60a1961864b70c17cbf760f6a8 /common/pkg | |
| parent | 0ade4a7e3a323df631c9772e4db5173a20979d46 (diff) | |
| parent | 5f2a29120ba2d22d7d2406628ce2f6735b60d09c (diff) | |
Merge branch 'release-0.4.4'0.4.4
Diffstat (limited to 'common/pkg')
| -rw-r--r-- | common/pkg/requirements-testing.pip | 5 | ||||
| -rwxr-xr-x | common/pkg/tools/with_venvwrapper.sh | 19 |
2 files changed, 19 insertions, 5 deletions
diff --git a/common/pkg/requirements-testing.pip b/common/pkg/requirements-testing.pip index 6ff52ff9..9302450c 100644 --- a/common/pkg/requirements-testing.pip +++ b/common/pkg/requirements-testing.pip @@ -1,10 +1,5 @@ mock -nose2 testscenarios leap.common leap.soledad.server leap.soledad.client - -# Under quarantine... -# I've been able to run all tests with six==1.3 -- kali -# six==1.1.0 # some tests are incompatible with newer versions of six. diff --git a/common/pkg/tools/with_venvwrapper.sh b/common/pkg/tools/with_venvwrapper.sh new file mode 100755 index 00000000..b62bc10f --- /dev/null +++ b/common/pkg/tools/with_venvwrapper.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +#Wraps a command in a virtualenwrapper passed as first argument. +#Example: +#with_virtualenvwrapper.sh leap-bitmask ./run_tests.sh + +wd=`pwd` +alias pyver='python -c "import $1;print $1.__path__[0]; print $1.__version__;"' + +source `which virtualenvwrapper.sh` +echo "Activating virtualenv " $1 +echo "------------------------------------" +workon $1 +cd $wd +echo "running version: " +echo `pyver leap.bitmask` +echo `pyver leap.soledad.common` +echo `pyver leap.keymanager` +$2 $3 $4 $5 |