summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorkali <kali@leap.se>2013-01-24 07:59:35 +0900
committerkali <kali@leap.se>2013-01-24 07:59:35 +0900
commit26d1849415402a5aa826c57519d40a19cc67c059 (patch)
tree96011407b7e0e7d0eefa1f1d7f81d7b863ab6172 /pkg
parent88159d703e9b75d3cb0c192e7d7ae92d9d8c67bc (diff)
parent73b73793d524b795279a697cad12c22a808f5c36 (diff)
Merge branch 'feature/deprecate-gnutls' into develop
Diffstat (limited to 'pkg')
-rw-r--r--pkg/requirements.pip10
1 files changed, 6 insertions, 4 deletions
diff --git a/pkg/requirements.pip b/pkg/requirements.pip
index 813a9c62..4108d259 100644
--- a/pkg/requirements.pip
+++ b/pkg/requirements.pip
@@ -3,18 +3,20 @@
argparse # only for python 2.6
requests<1.0.0
-ping # don't use it! needs root.
psutil
netifaces
-python-gnutls==1.1.9 # see https://bugs.launchpad.net/ubuntu/+source/python-gnutls/+bug/1027129
+pyopenssl
jsonschema
srp>=1.0.2
pycrypto
keyring
python-dateutil
+sh
+pygeoip # optional
+#ping # to be deprecated
+
+# soledad deps -- will move to its own repo soon
python-gnupg
u1db
oauth
couchdb
-sh
-pygeoip