Update store group/sharing tests to new API specs

[kamaki] / setup.py

diff --git a/setup.py b/setup.py
index a6772e0..fd4a010 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -42,11 +42,10 @@ import kamaki
 
 optional = ['ansicolors',
             'progress>=1.0.2']
-requires = ['objpool',
-            'argparse']
+requires = ['objpool']
 
-if not hasattr(collections, "OrderedDict"):  # Python 2.6
-    requires.append("ordereddict")
+if version_info[:1] == (2, 6):
+    requires.append('argparse')
 
 setup(
     name='kamaki',
@@ -58,11 +57,15 @@ setup(
     packages=[
         'kamaki',
         'kamaki.clients',
+        'kamaki.clients.tests',
         'kamaki.clients.connection',
         'kamaki.cli',
         'kamaki.cli.commands',
+        'kamaki.clients.tests',
         'kamaki.clients.commissioning',
-        'kamaki.clients.quotaholder'
+        'kamaki.clients.quotaholder',
+        'kamaki.clients.quotaholder.api',
+        'kamaki.clients.commissioning.utils'
     ],
     include_package_data=True,
     entry_points={