Merge branch 'setuppy-regress' into develop

* setuppy-regress: Fix regression with old version of pip and cond deps
swipely · Jun 12, 2015 · 7f7cee9 · 7f7cee9
2 parents 559ebfa + 4fbdd3a
commit 7f7cee9
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/setup.py b/setup.py
@@ -13,6 +13,12 @@
             'rsa>=3.1.2,<=3.1.4']
 
 
+if sys.version_info[:2] == (2, 6):
+    # For python2.6 we have to require argparse since it
+    # was not in stdlib until 2.7.
+    requires.append('argparse>=1.1')
+
+
 setup_options = dict(
     name='awscli',
     version=awscli.__version__,