Merge branch 'dionyziz' into develop

[kamaki] / setup.py

diff --git a/setup.py b/setup.py
index 3b02e0d..cb89d9d 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -33,10 +33,17 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
+from setuptools import setup
+from sys import version_info
+
 import kamaki
 
-from setuptools import setup
 
+optional = ['ansicolors',
+            'progress>=1.0.2']
+requires = ['objpool',
+            'ordereddict',
+            'argparse']
 
 setup(
     name='kamaki',
@@ -45,13 +52,10 @@ setup(
     long_description=open('README.rst').read(),
     url='http://code.grnet.gr/projects/kamaki',
     license='BSD',
-    packages=['kamaki', 'kamaki.clients'],
+    packages=['kamaki', 'kamaki.clients', 'kamaki.clients.connection', 'kamaki.cli', 'kamaki.cli.commands'],
     include_package_data=True,
     entry_points={
         'console_scripts': ['kamaki = kamaki.cli:main']
     },
-    install_requires=[
-        'requests>=0.10.2',
-        'clint>=0.3'
-    ]
+    install_requires=requires
 )