summaryrefslogtreecommitdiff
path: root/soledad/setup.py
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-15 11:33:26 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-15 11:33:26 -0300
commita9ddf49a05e3f6610dd5a96307c37fb4f4cf3d65 (patch)
tree24d4626674968746854d9d9e0cb21dc3126429c1 /soledad/setup.py
parent5513cbb2432255087cfff47f1a287cdd351b892e (diff)
parentdf8b3c9bcbb3659667f8a7e08de6ad9aaf527ff2 (diff)
Merge remote-tracking branch 'drebs/feature/2601-use-pycryptopp' into develop
Diffstat (limited to 'soledad/setup.py')
-rw-r--r--soledad/setup.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/soledad/setup.py b/soledad/setup.py
index f2291662..6da976a9 100644
--- a/soledad/setup.py
+++ b/soledad/setup.py
@@ -32,8 +32,7 @@ install_requirements = [
'six==1.1.0',
'scrypt',
'pyxdg',
- 'pycrypto',
- 'pyOpenSSL',
+ 'pycryptopp',
]
@@ -43,6 +42,7 @@ tests_requirements = [
'testscenarios',
'leap.common',
'leap.soledad_server',
+ 'pyOpenSSL',
]