diff options
author | drebs <drebs@leap.se> | 2013-01-24 14:29:31 -0200 |
---|---|---|
committer | drebs <drebs@leap.se> | 2013-01-24 14:29:31 -0200 |
commit | 1a9eb8218722ae64643c8e77f381c5609a89e18f (patch) | |
tree | 37001cefd064f3acd71ffc916508a206629bd4a0 /pkg/test-requirements.pip | |
parent | 04f7e29aaf29edd693265831a609db681641390d (diff) | |
parent | cfeddae5b94a6ab9883f3226702dee31850d638f (diff) |
Merge branch 'develop' of ssh://code.leap.se/leap_client into develop
Conflicts:
src/leap/soledad/__init__.py
Diffstat (limited to 'pkg/test-requirements.pip')
-rw-r--r-- | pkg/test-requirements.pip | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkg/test-requirements.pip b/pkg/test-requirements.pip index 43bec43c..edd53b16 100644 --- a/pkg/test-requirements.pip +++ b/pkg/test-requirements.pip @@ -1,3 +1,4 @@ +six>=1.1,<1.2 # soledad req (nose2) unittest2 # TODO we should include this dep only for python2.6 coverage mock @@ -7,5 +8,6 @@ sphinx>=1.1.2 nose-exclude # for soledad * to be splitted * +nose2 testscenarios testtools |