diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-21 14:56:06 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-21 14:56:06 -0300 |
| commit | 442d298f271f9065ee5d4b308aa3dc6662c258dc (patch) | |
| tree | 8cc0d5b5faf8fb53afa3311388abe469e8795308 | |
| parent | 7d194296f69c97f67d117286086a0fcba3500dfe (diff) | |
| parent | 82191866aa668e7ad294087c0365decf54588698 (diff) | |
Merge remote-tracking branch 'drebs/feature/3487-split-soledad-into-common-client-and-server' into develop
| -rw-r--r-- | keymanager/changes/feature_3487-split-soledad-into-common-client-and-server | 2 | ||||
| -rw-r--r-- | keymanager/setup.py | 2 | ||||
| -rw-r--r-- | keymanager/src/leap/keymanager/tests/test_keymanager.py | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/keymanager/changes/feature_3487-split-soledad-into-common-client-and-server b/keymanager/changes/feature_3487-split-soledad-into-common-client-and-server new file mode 100644 index 00000000..46983232 --- /dev/null +++ b/keymanager/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/keymanager/setup.py b/keymanager/setup.py index 88fe35fd..c42ad2b0 100644 --- a/keymanager/setup.py +++ b/keymanager/setup.py @@ -32,7 +32,7 @@ install_requirements = [ tests_requirements = [ 'mock', - 'leap.soledad', + 'leap.soledad.client', ] diff --git a/keymanager/src/leap/keymanager/tests/test_keymanager.py b/keymanager/src/leap/keymanager/tests/test_keymanager.py index a474e32a..5f232fed 100644 --- a/keymanager/src/leap/keymanager/tests/test_keymanager.py +++ b/keymanager/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, |