Merge branch 'master' into release/v0.2.2

descarteslabs · May 4, 2017 · 40393a2 · 40393a2
2 parents 78625f7 + e63a7db
commit 40393a2
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/setup.py b/setup.py
@@ -57,10 +57,16 @@ def do_setup():
         'descarteslabs/scripts/metadata',
     ]
     kwargs['install_requires'] = [
-        "requests",
         "cachetools",
         "six",
     ]
+
+    # Python < 2.7.9 needs requests[security] to avoid SSL issues
+    if sys.version_info[0:3] >= (2, 7, 9):
+        kwargs["install_requires"].append('requests')
+    else:
+        kwargs["install_requires"].append('requests[security]')
+
     kwargs['license'] = 'Apache 2.0',
     kwargs['zip_safe'] = False