summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-21 14:56:06 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-21 14:56:06 -0300
commit0347bf68d394118460566c8cd5cd49c75b0825f7 (patch)
tree781a047598038d99de4888d856bf8e8e617e87f7
parentb8330f441f094f5d32490b9c6c64b5998eaccf4e (diff)
parent5065f2576d58ca7d6344491a26931bc3b1b70588 (diff)
Merge remote-tracking branch 'drebs/feature/3487-split-soledad-into-common-client-and-server' into develop
-rw-r--r--changes/feature_3487-split-soledad-into-common-client-and-server2
-rw-r--r--setup.py2
-rw-r--r--src/leap/keymanager/tests/test_keymanager.py2
3 files changed, 4 insertions, 2 deletions
diff --git a/changes/feature_3487-split-soledad-into-common-client-and-server b/changes/feature_3487-split-soledad-into-common-client-and-server
new file mode 100644
index 00000000..46983232
--- /dev/null
+++ b/changes/feature_3487-split-soledad-into-common-client-and-server
@@ -0,0 +1,2 @@
+ o Update to new soledad package scheme (common, client and server). Closes
+ #3487.
diff --git a/setup.py b/setup.py
index 88fe35fd..c42ad2b0 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ install_requirements = [
tests_requirements = [
'mock',
- 'leap.soledad',
+ 'leap.soledad.client',
]
diff --git a/src/leap/keymanager/tests/test_keymanager.py b/src/leap/keymanager/tests/test_keymanager.py
index a474e32a..5f232fed 100644
--- a/src/leap/keymanager/tests/test_keymanager.py
+++ b/src/leap/keymanager/tests/test_keymanager.py
@@ -23,7 +23,7 @@ Tests for the Key Manager.
from mock import Mock
from leap.common.testing.basetest import BaseLeapTest
-from leap.soledad import Soledad
+from leap.soledad.client import Soledad
from leap.keymanager import (
KeyManager,
openpgp,