Recognise usernames in --account args (or similar)

[kamaki] / setup.py

diff --git a/setup.py b/setup.py
index 47023b7..dcf3d5e 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -35,14 +35,13 @@
 
 from setuptools import setup
 from sys import version_info
-import collections
 
 import kamaki
 
 
 optional = ['ansicolors', 'mock>=1.0.1']
 
-requires = ['objpool>=0.2', 'progress>=1.1']
+requires = ['objpool>=0.2', 'progress>=1.1', 'astakosclient>=0.14.10']
 
 if version_info < (2, 7):
     requires.append('argparse')
@@ -62,18 +61,19 @@ setup(
     packages=[
         'kamaki',
         'kamaki.cli',
-        'kamaki.cli.command_tree',
-        'kamaki.cli.argument',
         'kamaki.cli.utils',
+        'kamaki.cli.config',
+        'kamaki.cli.argument',
         'kamaki.cli.commands',
+        'kamaki.cli.command_tree',
         'kamaki.clients',
         'kamaki.clients.utils',
-        'kamaki.clients.livetest',
+        'kamaki.clients.astakos',
         'kamaki.clients.image',
         'kamaki.clients.storage',
         'kamaki.clients.pithos',
-        'kamaki.clients.astakos',
         'kamaki.clients.compute',
+        'kamaki.clients.network',
         'kamaki.clients.cyclades',
     ],
     classifiers=[
@@ -91,7 +91,10 @@ setup(
         ],
     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
 )