summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-06-05 13:17:00 -0300
committerTomás Touceda <chiiph@leap.se>2013-06-05 13:17:00 -0300
commit151a5c3c18573e7b43728d708660ed69e966e8a1 (patch)
treee6da8dda7f479a7c148d5bd6c89376ab8698757d /setup.py
parentebca23cd426690453cf5581f32a44121ae1219ce (diff)
parent6578eade269c6061599cd09476df893e57b109de (diff)
Merge remote-tracking branch 'drebs/feature/2602-remove-strict-dependency-on-leap.common-2' into develop
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/setup.py b/setup.py
index b1c0b9db..b989f48a 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,6 @@ from setuptools import (
install_requirements = [
'configparser',
'couchdb',
- 'leap.common',
'pysqlcipher',
'simplejson',
'twisted>=12.0.0', # TODO: maybe we just want twisted-web?
@@ -35,9 +34,10 @@ install_requirements = [
'u1db',
'requests',
'six==1.1.0',
- 'pysqlite',
'scrypt',
'routes',
+ 'pyxdg',
+ 'pycrypto',
]
@@ -45,6 +45,7 @@ tests_requirements = [
'mock',
'nose2',
'testscenarios',
+ 'leap.common',
]
@@ -89,4 +90,7 @@ setup(
tests_require=tests_requirements,
data_files=data_files,
classifiers=trove_classifiers,
+ extras_require={
+ 'signaling': ['leap.common'],
+ }
)