X-Git-Url: https://code.grnet.gr/git/kamaki/blobdiff_plain/19f48e75126d568c81ad2cfdf495938c1d7aee3f..9b47150e799400c9e97324b895421bbc6d5f6cf3:/setup.py

diff --git a/setup.py b/setup.py
index 070194e..87a9c32 100755
--- a/setup.py
+++ b/setup.py
@@ -34,29 +34,61 @@
 # 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', 'mock>=1.0.1']
+
+requires = ['objpool>=0.2', 'progress>=1.1']
+
+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 www.synnefo.org clouds',
     long_description=open('README.rst').read(),
     url='http://code.grnet.gr/projects/kamaki',
+    download_url='https://code.grnet.gr/projects/kamaki/files',
     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.connection',
-        'kamaki.cli.commands'],
+        'kamaki.clients.utils',
+        'kamaki.clients.livetest',
+        'kamaki.clients.image',
+        'kamaki.clients.storage',
+        'kamaki.clients.pithos',
+        'kamaki.clients.astakos',
+        'kamaki.clients.compute',
+        'kamaki.clients.cyclades',
+    ],
+    classifiers=[
+        'Operating System :: OS Independent',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Intended Audience :: Developers',
+        'Intended Audience :: System Administrators',
+        'Environment :: Console',
+        'License :: OSI Approved :: BSD License',
+        'Natural Language :: English',
+        'Topic :: System :: Shells',
+        'Topic :: Software Development :: Libraries :: Python Modules',
+        'Topic :: Utilities'
+        ],
     include_package_data=True,
     entry_points={
         'console_scripts': ['kamaki = kamaki.cli:main']
     },
-    install_requires=required
+    install_requires=requires
 )