Merge branch 'feature-logging' into develop

[kamaki] / setup.py

diff --git a/setup.py b/setup.py
index 22094cb..2d85ddd 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -35,14 +35,17 @@
 
 from setuptools import setup
 from sys import version_info
+import collections
 
 import kamaki
 
 
-required = ['ansicolors==1.0.2', 'progress==1.0.1', 'requests==0.12.1', 'gevent']
+optional = ['ansicolors', 'mock>=1.0.1']
 
-if version_info[0:2] < (2, 7):
-    required.extend(['argparse', 'ordereddict'])
+requires = ['objpool', 'progress>=1.1']
+
+if version_info < (2, 7):
+    requires.append('argparse')
 
 setup(
     name='kamaki',
@@ -51,10 +54,32 @@ setup(
     long_description=open('README.rst').read(),
     url='http://code.grnet.gr/projects/kamaki',
     license='BSD',
-    packages=['kamaki', 'kamaki.cli', 'kamaki.clients', 'kamaki.clients.connection', 'kamaki.cli.commands'],
+    author='Synnefo development team',
+    author_email='synnefo-devel@googlegroups.com',
+    maintainer='Synnefo development team',
+    maintainer_email='synnefo-devel@googlegroups.com',
+    packages=[
+        'kamaki',
+        'kamaki.cli',
+        'kamaki.cli.commands',
+        'kamaki.clients',
+        'kamaki.clients.utils',
+        'kamaki.clients.livetest',
+        'kamaki.clients.image',
+        'kamaki.clients.storage',
+        'kamaki.clients.pithos',
+        'kamaki.clients.astakos',
+        'kamaki.clients.compute',
+        'kamaki.clients.cyclades',
+        'kamaki.clients.connection',
+        'kamaki.clients.commissioning',
+        'kamaki.clients.quotaholder',
+        'kamaki.clients.quotaholder.api',
+        'kamaki.clients.commissioning.utils'
+    ],
     include_package_data=True,
     entry_points={
         'console_scripts': ['kamaki = kamaki.cli:main']
     },
-    install_requires=required
+    install_requires=requires
 )