summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-01-24 14:29:31 -0200
committerdrebs <drebs@leap.se>2013-01-24 14:29:31 -0200
commit1a9eb8218722ae64643c8e77f381c5609a89e18f (patch)
tree37001cefd064f3acd71ffc916508a206629bd4a0 /pkg
parent04f7e29aaf29edd693265831a609db681641390d (diff)
parentcfeddae5b94a6ab9883f3226702dee31850d638f (diff)
Merge branch 'develop' of ssh://code.leap.se/leap_client into develop
Conflicts: src/leap/soledad/__init__.py
Diffstat (limited to 'pkg')
-rw-r--r--pkg/requirements.pip2
-rw-r--r--pkg/test-requirements.pip2
2 files changed, 3 insertions, 1 deletions
diff --git a/pkg/requirements.pip b/pkg/requirements.pip
index 4108d259..9b521a95 100644
--- a/pkg/requirements.pip
+++ b/pkg/requirements.pip
@@ -13,7 +13,7 @@ keyring
python-dateutil
sh
pygeoip # optional
-#ping # to be deprecated
+ping # to be deprecated
# soledad deps -- will move to its own repo soon
python-gnupg
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