Merge branch 'develop' into feature-tests

[kamaki] / setup.py

diff --git a/setup.py b/setup.py
index 070194e..97518ab 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -34,29 +34,46 @@
 # or implied, of GRNET S.A.
 
 from setuptools import setup
-#from sys import version_info
+from sys import version_info
+import collections
 
 import kamaki
 
-#Suggested packages can be installed manually later, but it is not nessecary
-suggested = ['ansicolors==1.0.2', 'progress==1.0.1']
-required = ['gevent>=0.13.6', 'snf-common>=0.10', 'argparse']
+
+optional = ['ansicolors',
+            'progress>=1.0.2']
+requires = ['objpool', 'mock']
+
+if version_info < (2, 7):
+    requires.append('argparse')
 
 setup(
     name='kamaki',
     version=kamaki.__version__,
-    description='A command-line tool for poking clouds',
+    description='A command-line tool for managing clouds',
     long_description=open('README.rst').read(),
     url='http://code.grnet.gr/projects/kamaki',
     license='BSD',
-    packages=['kamaki',
+    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.test',
+        'kamaki.clients.livetest',
         'kamaki.clients.connection',
-        'kamaki.cli.commands'],
+        '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
 )