Fix BUILD file generation for dirty wheels

scele · scele · commit 179eb9597bb9 · 2018-08-30T11:37:06.000+03:00
When extracting foo_dirty wheel repository, we pass all wheels as an
argument to piptool that transitively depend on foo, so that piptool
will extract all of them to the foo_dirty repository.  After that,
piptool generates a BUILD file from the *first* wheel, expecting
that to be foo.whl.  This was not happening, since we were passing
wheels in random order to piptool extract.
diff --git a/WORKSPACE b/WORKSPACE
@@ -173,8 +173,9 @@ pip_import(
     },
     remove_runtime_deps = {
         # https://github.com/keras-team/keras/issues/10505
-        "keras-applications": ["keras"],
-        "keras-preprocessing": ["keras"],
+        "keras-applications": ["keras", "keras-applications"],
+        "keras-preprocessing": ["keras", "keras-preprocessing"],
+        "keras": ["keras"],
     },
     python = "@python2//:bin/python",
 )
diff --git a/rules_python/whl.bzl.tpl b/rules_python/whl.bzl.tpl
@@ -58,12 +58,17 @@ def whl_library(key, all_libs, name, wheel_name, version=None, urls=None, whl=No
             )
 
     if dirty_repo_name not in native.existing_rules():
-        dep_keys = {d.split("[")[0]: None for d in transitive_runtime_deps}
-        dep_keys[key] = None
+        # Make sure the current package's wheel is the first element in the "wheels" list,
+        # since piptool will generate the BUILD file based on that.  The remaining wheels
+        # on the list should be all transitive runtime dependencies (unless explicitly
+        # dropped at pip_import rule level).
+        dep_keys = {d.split("[")[0]: None for d in transitive_runtime_deps if d not in remove_runtime_deps}
         if whl:
-            wheels = ["@%s//:%s" % (repository, all_libs[key]["wheel_name"]) for key in dep_keys]
+            wheels = ["@%s//:%s" % (repository, all_libs[key]["wheel_name"])] + \
+                     ["@%s//:%s" % (repository, all_libs[key]["wheel_name"]) for key in dep_keys]
         else:
-            wheels = [_wheel(all_libs, d) for d in dep_keys]
+            wheels = [_wheel(all_libs, key)] + \
+                     [_wheel(all_libs, d) for d in dep_keys]
         extract_wheels(
             name = dirty_repo_name,
             wheels = wheels,
