Merge branch 'master' of github.com:arq5x/gemini

brentp · Mar 3, 2015 · c63e1ad · c63e1ad
2 parents cabcec2 + 2b7c6c8
commit c63e1ad
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/gemini/gemini_update.py b/gemini/gemini_update.py
@@ -43,6 +43,12 @@ def release(parser, args):
             for req in ["python-graph-core", "python-graph-dot"]:
                 pip_compat += ["--allow-external", req, "--allow-unverified", req]
         # update libraries
+        # Set PIP SSL certificate to installed conda certificate to avoid SSL errors
+        if os.path.exists(conda_bin):
+            anaconda_dir = os.path.dirname(os.path.dirname(conda_bin))
+            cert_file = os.path.join(anaconda_dir, "ssl", "cert.pem")
+            if os.path.exists(cert_file):
+                os.environ["PIP_CERT"] = cert_file
         subprocess.check_call([pip_bin, "install"] + pip_compat + ["-r", url])
         if args.devel:
             print("Installing latest GEMINI development version")

diff --git a/gemini/scripts/gemini_install.py b/gemini/scripts/gemini_install.py
@@ -101,6 +101,10 @@ def install_gemini(anaconda, remotes, datadir, tooldir, use_sudo):
     if pip_version >= "1.5":
         for req in ["python-graph-core", "python-graph-dot"]:
             pip_compat += ["--allow-external", req, "--allow-unverified", req]
+    # Set PIP SSL certificate to installed conda certificate to avoid SSL errors
+    cert_file = os.path.join(anaconda["dir"], "ssl", "cert.pem")
+    if os.path.exists(cert_file):
+        os.environ["PIP_CERT"] = cert_file
     subprocess.check_call([anaconda["pip"], "install"] + pip_compat + ["-r", remotes["requirements_pip"]])
     python_bin = os.path.join(anaconda["dir"], "bin", "python")
     _cleanup_problem_files(anaconda["dir"])