Merge pull request bazel-contrib#40 from mattmoor/test-head

mattmoor · web-flow · commit 72456c968a14 · 2017-11-16T12:21:43.000-08:00
This updates WORKSPACE to the latest subpar, and ./update_tools.sh.
diff --git a/WORKSPACE b/WORKSPACE
@@ -52,7 +52,7 @@ _piptool_install()
 git_repository(
     name = "subpar",
     remote = "https://github.com/google/subpar",
-    tag = "1.0.0",
+    tag = "1.1.0",
 )
 
 # Test data for WHL tool testing.
diff --git a/rules_python/piptool.py b/rules_python/piptool.py
@@ -48,8 +48,10 @@ def extract_packages(package_names):
     # Add extracted directories to import path ahead of their zip file
     # counterparts.
     sys.path[0:0] = dirs_to_add
-    existing_pythonpath = os.environ['PYTHONPATH'].split(':')
-    os.environ['PYTHONPATH'] = ':'.join(dirs_to_add + existing_pythonpath)
+    existing_pythonpath = os.environ.get('PYTHONPATH')
+    if existing_pythonpath:
+        dirs_to_add.extend(existing_pythonpath.split(':'))
+    os.environ['PYTHONPATH'] = ':'.join(dirs_to_add)
 
 
 # Wheel, pip, and setuptools are much happier running from actual
@@ -68,7 +70,12 @@ def extract_packages(package_names):
 
 
 def pip_main(argv):
-    argv = ["--disable-pip-version-check"] + argv
+    # Extract the certificates from the PAR following the example of get-pip.py
+    # https://github.com/pypa/get-pip/blob/430ba37776ae2ad89/template.py#L164-L168
+    cert_path = os.path.join(tempfile.mkdtemp(), "cacert.pem")
+    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
     return pip.main(argv)
 
 
diff --git a/tools/piptool.par b/tools/piptool.par

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ _piptool_install()`
`52`	`52`	`git_repository(`
`53`	`53`	`name = "subpar",`
`54`	`54`	`remote = "https://github.com/google/subpar",`
`55`		`- tag = "1.0.0",`
	`55`	`+ tag = "1.1.0",`
`56`	`56`	`)`
`57`	`57`
`58`	`58`	`# Test data for WHL tool testing.`