Merge branch 'develop' into feature-tests

[kamaki] / setup.py

diff --git a/setup.py b/setup.py
index 9244543..97518ab 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -42,9 +42,9 @@ import kamaki
 
 optional = ['ansicolors',
             'progress>=1.0.2']
-requires = ['objpool']
+requires = ['objpool', 'mock']
 
-if version_info[:1] == (2, 6):
+if version_info < (2, 7):
     requires.append('argparse')
 
 setup(
@@ -54,12 +54,18 @@ setup(
     long_description=open('README.rst').read(),
     url='http://code.grnet.gr/projects/kamaki',
     license='BSD',
+    author='Synnefo development team',
+    author_email='synnefo-devel@googlegroups.com',
+    maintainer='Synnefo development team',
+    maintainer_email='synnefo-devel@googlegroups.com',
     packages=[
         'kamaki',
-        'kamaki.clients',
-        'kamaki.clients.connection',
         'kamaki.cli',
         'kamaki.cli.commands',
+        'kamaki.clients',
+        'kamaki.clients.test',
+        'kamaki.clients.livetest',
+        'kamaki.clients.connection',
         'kamaki.clients.commissioning',
         'kamaki.clients.quotaholder',
         'kamaki.clients.quotaholder.api',