summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--setup.py15
-rw-r--r--src/leap/soledad/tests/__init__.py2
-rw-r--r--src/leap/soledad/tests/test_crypto.py2
-rw-r--r--src/leap/soledad/tests/test_sqlcipher.py2
4 files changed, 14 insertions, 7 deletions
diff --git a/setup.py b/setup.py
index 3ecb29d3..ff206571 100644
--- a/setup.py
+++ b/setup.py
@@ -11,9 +11,15 @@ install_requirements = [
'couchdb',
'configparser',
'simplejson',
- 'pysqlite',
- # TODO: add dependency for leap client ?
- # TODO: add dependency for pysqlcipher.
+ 'pysqlcipher',
+ 'leap.common',
+]
+
+
+# TODO: change below so we get stable versions of modules.
+dependency_links = [
+ 'git+git://git.futeisha.org/pysqlcipher.git@develop#egg=pysqlcipher',
+ 'git+ssh://code.leap.se/leap_pycommon.git@develop#egg=leap_pycommon',
]
@@ -43,5 +49,6 @@ setup(
package_dir = {'': 'src'},
test_suite='nose2.collector.collector',
install_requires=install_requirements,
- tests_requires=tests_requirements,
+ tests_require=tests_requirements,
+ dependency_links=dependency_links
)
diff --git a/src/leap/soledad/tests/__init__.py b/src/leap/soledad/tests/__init__.py
index 1ed2e248..8ceafe99 100644
--- a/src/leap/soledad/tests/__init__.py
+++ b/src/leap/soledad/tests/__init__.py
@@ -6,7 +6,7 @@ import u1db
from leap.soledad import Soledad
from leap.soledad.util import GPGWrapper
from leap.soledad.backends.leap_backend import LeapDocument
-from leap.testing.basetest import BaseLeapTest
+from leap.common.testing.basetest import BaseLeapTest
#-----------------------------------------------------------------------------
diff --git a/src/leap/soledad/tests/test_crypto.py b/src/leap/soledad/tests/test_crypto.py
index 52cc0315..a92e2c46 100644
--- a/src/leap/soledad/tests/test_crypto.py
+++ b/src/leap/soledad/tests/test_crypto.py
@@ -1,5 +1,5 @@
import os
-from leap.testing.basetest import BaseLeapTest
+from leap.common.testing.basetest import BaseLeapTest
from leap.soledad.backends.leap_backend import LeapDocument
from leap.soledad.tests import BaseSoledadTest
from leap.soledad.tests import (
diff --git a/src/leap/soledad/tests/test_sqlcipher.py b/src/leap/soledad/tests/test_sqlcipher.py
index 7b8f6298..23847556 100644
--- a/src/leap/soledad/tests/test_sqlcipher.py
+++ b/src/leap/soledad/tests/test_sqlcipher.py
@@ -30,7 +30,7 @@ from leap.soledad.tests.u1db_tests import test_backends
from leap.soledad.tests.u1db_tests import test_open
from leap.soledad.tests.u1db_tests import test_sync
from leap.soledad.backends.leap_backend import LeapSyncTarget
-from leap.testing.basetest import BaseLeapTest
+from leap.common.testing.basetest import BaseLeapTest
PASSWORD = '123456'