Fix history typo

[kamaki] / setup.py

diff --git a/setup.py b/setup.py
index fc20d0c..9401686 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright 2011 GRNET S.A. All rights reserved.
+# Copyright 2011-2013 GRNET S.A. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or
 # without modification, are permitted provided that the following
@@ -34,41 +34,68 @@
 # or implied, of GRNET S.A.
 
 from setuptools import setup
-#from sys import version_info
-import collections
+from sys import version_info
 
 import kamaki
 
 
-optional = ['ansicolors',
-            'progress>=1.0.2']
-requires = ['objpool',
-            'argparse']
+optional = ['ansicolors', 'mock>=1.0.1']
 
-if not hasattr(collections, "OrderedDict"):  # Python 2.6
-    requires.append("ordereddict")
+requires = ['objpool>=0.2', 'progress>=1.1', 'astakosclient>=0.14.10']
+
+if version_info < (2, 7):
+    requires.append('argparse')
 
 setup(
     name='kamaki',
     version=kamaki.__version__,
-    description='A command-line tool for managing 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',
+    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.utils',
+        'kamaki.cli.config',
+        'kamaki.cli.argument',
         'kamaki.cli.commands',
-        'kamaki.clients.commissioning',
-        'kamaki.clients.quotaholder',
-        'kamaki.clients.quotaholder.api',
-        'kamaki.clients.commissioning.utils'
+        'kamaki.cli.command_tree',
+        'kamaki.clients',
+        'kamaki.clients.utils',
+        'kamaki.clients.astakos',
+        'kamaki.clients.image',
+        'kamaki.clients.storage',
+        'kamaki.clients.pithos',
+        'kamaki.clients.compute',
+        'kamaki.clients.network',
+        'kamaki.clients.cyclades',
+        'kamaki.clients.livetest',
     ],
+    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']
+        'console_scripts': [
+            'kamaki = kamaki.cli:run_one_cmd',
+            'kamaki-shell = kamaki.cli:run_shell'
+        ]
     },
     install_requires=requires
 )