summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2017-04-06 00:59:59 +0200
committerKali Kaneko <kali@leap.se>2017-06-27 10:33:42 +0200
commite82b8143d3e9b2f62650e06798eee262885036c2 (patch)
tree77ac4441db1eae3561460ab553837572210efc31 /pkg
parent462bc9d4aa1931ad3341e350681d64208e71f70b (diff)
[feat] use PGPy instead of leap.keymanager to encrypt
In PGPy 0.4.0 keys are not accepted if they have empty lines before the ascii armored text. I addapt the tests around that for now. This is fixed already in PGPy repo, so it will not be an issue in comming releases. - Resolves: #8558, #8663
Diffstat (limited to 'pkg')
-rw-r--r--pkg/requirements-leap.pip1
-rw-r--r--pkg/requirements.pip2
2 files changed, 2 insertions, 1 deletions
diff --git a/pkg/requirements-leap.pip b/pkg/requirements-leap.pip
index aab5fa5..1cfe861 100644
--- a/pkg/requirements-leap.pip
+++ b/pkg/requirements-leap.pip
@@ -1,3 +1,2 @@
leap.common>=0.5.1
leap.soledad.common>=0.8.0
-leap.keymanager>=0.5.0
diff --git a/pkg/requirements.pip b/pkg/requirements.pip
index 328b1c3..434673c 100644
--- a/pkg/requirements.pip
+++ b/pkg/requirements.pip
@@ -2,6 +2,8 @@ Twisted>=12.0.2
paisley>=0.3.1
+pgpy
+
# python-couchdb is used by leap.soledad.common,
# maybe we should get it as optional/recommends
# in soledad-common, but we need to declare here