diff options
| author | drebs <drebs@leap.se> | 2013-08-19 08:57:42 -0300 | 
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-08-19 08:57:42 -0300 | 
| commit | 82191866aa668e7ad294087c0365decf54588698 (patch) | |
| tree | 15bbed554125738e1640e21fdfb3b72fe115c56a | |
| parent | cc76711ff17e7f45eca4a28a601b792fd15dc64f (diff) | |
Update to new soledad package scheme.
| -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 0000000..4698323 --- /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 88fe35f..c42ad2b 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 a474e32..5f232fe 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, | 
