Merge remote-tracking branch 'drebs/feature/events-signals' into develop

Conflicts:
	.gitignore
	src/leap/common/__init__.py

1 files changed, 13 insertions, 3 deletions

diff --git a/setup.py b/setup.py
index b29c352..6732d69 100644
--- a/setup.py
+++ b/setup.py
@@ -19,9 +19,18 @@ setup file for leap.common
 """
 from setuptools import setup, find_packages
 
+
 requirements = [
+    'protobuf',
+    'protobuf.socketrpc',
 ]
 
+
+dependency_links = [
+    'https://protobuf-socket-rpc.googlecode.com/files/protobuf.socketrpc-1.3.2-py2.6.egg#egg=protobuf.socketrpc',
+]
+
+
 # XXX add classifiers, docs
 
 setup(
@@ -37,7 +46,8 @@ setup(
     ),
     namespace_packages=["leap"],
     package_dir={'': 'src'},
-    packages=find_packages('src'),
-    #test_suite='leap.common.tests',
-    #install_requires=requirements,
+    packages=find_packages('src', exclude=['leap.common.tests']),
+    test_suite='leap.common.tests',
+    install_requires=requirements,
+    dependency_links=dependency_links,
 )