Merge branch 'master' into mattmoor-patch-1

Author: mattmoor

README.md

@@ -1,6 +1,6 @@
 # Bazel Python Rules
 
-[![Build Status](http://ci.bazel.io/buildStatus/icon?job=rules_python)](http://ci.bazel.io/job/rules_python)
+[![Build Status](https://ci.bazel.io/buildStatus/icon?job=rules_python)](https://ci.bazel.io/job/rules_python)
 
 ## Rules
 

rules_python/piptool.py

@@ -22,12 +22,8 @@
 import tempfile
 import zipfile
 
-# TODO(mattmoor): When this tool is invoked bundled as a PAR file,
-# but not as a py_binary, we get a warning that indicates the system
-# installed version of PIP is being picked up instead of our bundled
-# version, which should be 9.0.1, e.g.
-#   You are using pip version 1.5.4, however version 9.0.1 is available.
-#   You should consider upgrading via the 'pip install --upgrade pip' command.
+# PIP erroneously emits an error when bundled as a PAR file.  We
+# disable the version check to silence it.
 try:
   # Make sure we're using a suitable version of pip as a library.
   # Fallback on using it as a CLI.
@@ -40,7 +36,8 @@ def pip_main(argv):
     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"))
-    return _pip_main(argv + ["--cert", cert_path])
+    argv = ["--disable-pip-version-check", "--cert", cert_path] + argv
+    return _pip_main(argv)
 
 except:
   import subprocess

rules_python/whl.py

@@ -58,7 +58,7 @@ def metadata(self):
     # directory.
     with zipfile.ZipFile(self.path(), 'r') as whl:
       with whl.open(os.path.join(self._dist_info(), 'metadata.json')) as f:
-        return json.loads(f.read())
+        return json.loads(f.read().decode("utf-8"))
 
   def name(self):
     return self.metadata().get('name')

tools/BUILD

@@ -15,5 +15,5 @@ package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])  # Apache 2.0
 
-# This is generated and updated by ./update_piptool.sh
+# This is generated and updated by ./update_tools.sh
 exports_files(["piptool.par"])