From 48d2a6a1265a61f8da6acf5891ed10a0a0247f37 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Thu, 5 Sep 2019 15:46:25 -0700 Subject: [PATCH 1/2] Pass --isolated to pip This fixes an issue where if you have bad URLs in your ~/.pip/pip.conf, pip would pick them up and end up failing bazel. This way we make pip_import more hermetic and ignore user config. --- packaging/piptool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/piptool.py b/packaging/piptool.py index 838ba42e9f..2544032ee8 100644 --- a/packaging/piptool.py +++ b/packaging/piptool.py @@ -78,7 +78,7 @@ def pip_main(argv): atexit.register(lambda: shutil.rmtree(cert_tmpdir, ignore_errors=True)) with open(cert_path, "wb") as cert: cert.write(pkgutil.get_data("pip._vendor.requests", "cacert.pem")) - argv = ["--disable-pip-version-check", "--cert", cert_path] + argv + argv = ["--isolated", "--disable-pip-version-check", "--cert", cert_path] + argv return pip.main(argv) from packaging.whl import Wheel From 1ff274c8e679c50cf776b2e70acc7a3f522a7651 Mon Sep 17 00:00:00 2001 From: Jon Brandvein Date: Fri, 6 Sep 2019 11:55:23 -0400 Subject: [PATCH 2/2] Regenerate tools --- tools/piptool.par | Bin 5889361 -> 5889389 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/tools/piptool.par b/tools/piptool.par index 6f71bb6f914b524055523c55d86f694841719749..f0e0f224e58ee789bf99f2e583a0120536a9d52d 100755 GIT binary patch delta 7644 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 delta 7815 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