Merge remote-tracking branch 'drebs/feature/3487-split-soledad-into-common-client...
authorTomás Touceda <chiiph@leap.se>
Wed, 21 Aug 2013 17:56:06 +0000 (14:56 -0300)
committerTomás Touceda <chiiph@leap.se>
Wed, 21 Aug 2013 17:56:06 +0000 (14:56 -0300)
changes/feature_3487-split-soledad-into-common-client-and-server [new file with mode: 0644]
setup.py
src/leap/keymanager/tests/test_keymanager.py

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 (file)
index 0000000..4698323
--- /dev/null
@@ -0,0 +1,2 @@
+  o Update to new soledad package scheme (common, client and server). Closes
+    #3487.
index 88fe35f..c42ad2b 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ install_requirements = [
 
 tests_requirements = [
     'mock',
-    'leap.soledad',
+    'leap.soledad.client',
 ]
 
 
index a474e32..5f232fe 100644 (file)
@@ -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,