jkinkead
diff --git a/‎rules_python/whl.py
Copy file name to clipboardExpand all lines: rules_python/whl.py
+26Lines changed: 26 additions & 0 deletions b/‎rules_python/whl.py
Copy file name to clipboardExpand all lines: rules_python/whl.py
+26Lines changed: 26 additions & 0 deletions
diff --git a/‎tools/piptool.par
Copy file name to clipboard
861 Bytes b/‎tools/piptool.par
Copy file name to clipboard
861 Bytes
diff --git a/‎tools/whltool.par
Copy file name to clipboard
1.68 KB b/‎tools/whltool.par
Copy file name to clipboard
1.68 KB
@@ -18,6 +18,7 @@
 import os
 import pkg_resources
 import re
+import shutil
 import zipfile
 
 
@@ -54,6 +55,12 @@ def _dist_info(self):
     #      google_cloud-0.27.0.dist-info
     return '{}-{}.dist-info'.format(self.distribution(), self.version())
 
+  def _data(self):
+    # Return the name of the data directory within the .whl file.
+    # e.g. google_cloud-0.27.0-py2.py3-none-any.whl ->
+    #      google_cloud-0.27.0.data
+    return '{}-{}.data'.format(self.distribution(), self.version())
+
   def metadata(self):
     # Extract the structured data from metadata.json in the WHL's dist-info
     # directory.
@@ -105,6 +112,25 @@ def expand(self, directory):
     with zipfile.ZipFile(self.path(), 'r') as whl:
       whl.extractall(directory)
 
+    # Find any lib directories, and move them to the top level.
+    try:
+        data_contents = os.listdir(self._data())
+    except:
+        data_contents = []
+
+    # TODO: This is probably wrong. These have different targets, and probably both need to be
+    # installed.
+    if 'purelib' in data_contents:
+        source = os.path.join(self._data(), 'purelib')
+    elif 'platlib' in data_contents:
+        source = os.path.join(self._data(), 'platlib')
+    else:
+        source = None
+
+    if source:
+        for f in os.listdir(source):
+            shutil.move(os.path.join(source, f), directory)
+
   # _parse_metadata parses METADATA files according to https://www.python.org/dev/peps/pep-0314/
   def _parse_metadata(self, content):
     # TODO: handle fields other than just name