Merge branch 'hotfix/depend-on-importlib-on-py2.6'

elasticluster · Dec 7, 2015 · f61487e · f61487e
2 parents b684028 + 0296be5
commit f61487e
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/setup.py b/setup.py
@@ -70,11 +70,13 @@ def ansible_pb_files():
     'python-gflags',
 ]
 
-if sys.version_info[:2] == (2, 6):
-    # Python 2.6.
-    # Google api python client *requires* argparse
-    # cfr. http://code.google.com/p/google-api-python-client/issues/detail?id=299
+if sys.version_info < (2, 7):
+    # Additional dependencies for Python 2.6:
+    # - Google api python client *requires* argparse,
+    #   cfr. http://code.google.com/p/google-api-python-client/issues/detail?id=299
     required_packages.append('argparse')
+    # - OpenStack's "keystoneclient" requires `importlib`
+    required_packages.append('importlib')
 
 setup(
     name="elasticluster",