summaryrefslogtreecommitdiff
path: root/pkg/requirements.pip
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-09-12 15:43:40 -0400
committerMicah Anderson <micah@riseup.net>2013-09-12 15:43:40 -0400
commit93372c3640cf2dea0677ad22ffebb0b793e2d512 (patch)
tree53bb2278172e1498353ea76dc7c9229146e98de5 /pkg/requirements.pip
parentcd1e63d957a7af0a46241052571a6861c2f19d1b (diff)
parent3e6dcdb705795110a10574d03bb74b13b542538f (diff)
Merge remote-tracking branch 'kali/debian-0.3.2' into debian
Diffstat (limited to 'pkg/requirements.pip')
-rw-r--r--pkg/requirements.pip8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkg/requirements.pip b/pkg/requirements.pip
index e04127b7..081f3ba9 100644
--- a/pkg/requirements.pip
+++ b/pkg/requirements.pip
@@ -9,18 +9,20 @@ argparse
requests
srp>=1.0.2
pyopenssl
-keyring
python-dateutil
psutil
ipaddr
twisted
qt4reactor
python-gnupg
+python-daemon # this should not be needed for Windows.
-leap.common>=0.3.0
+keyring<=2.9 # See #3759
+
+leap.common>=0.3.2
leap.soledad.client>=0.3.0
leap.keymanager>=0.2.0
-leap.mail>=0.3.0
+leap.mail>=0.3.2
# Remove this when u1db fixes its dependency on oauth
oauth