Remove dependency cycle (#29)

Author: dillon-giacoppo

extract_wheels/__init__.py

@@ -11,7 +11,7 @@
 import subprocess
 import sys
 
-from extract_wheels.lib import wheel, bazel
+from extract_wheels.lib import bazel
 
 
 def configure_reproducible_wheels() -> None:
@@ -71,7 +71,7 @@ def main() -> None:
     )
 
     targets = [
-        '"%s%s"' % (args.repo, wheel.extract_wheel(whl, []))
+        '"%s%s"' % (args.repo, bazel.extract_wheel(whl, []))
         for whl in glob.glob("*.whl")
     ]
 

extract_wheels/lib/__init__.py

@@ -1,8 +1,9 @@
 """Utility functions to manipulate Bazel files"""
+import os
 import textwrap
 from typing import Iterable, List
 
-from extract_wheels.lib import namespace_pkgs
+from extract_wheels.lib import namespace_pkgs, wheel, purelib
 
 
 def generate_build_file_contents(name: str, dependencies: List[str]) -> str:
@@ -110,3 +111,40 @@ def setup_namespace_pkg_compatibility(wheel_dir: str) -> None:
 
     for ns_pkg_dir in namespace_pkg_dirs:
         namespace_pkgs.add_pkgutil_style_namespace_pkg_init(ns_pkg_dir)
+
+
+def extract_wheel(wheel_file: str, extras: List[str]) -> str:
+    """Extracts wheel into given directory and creates a py_library target.
+
+    Args:
+        wheel_file: the filepath of the .whl
+        extras: a list of extras to add as dependencies for the installed wheel
+
+    Returns:
+        The Bazel label for the extracted wheel, in the form '//path/to/wheel'.
+    """
+
+    whl = wheel.Wheel(wheel_file)
+    directory = sanitise_name(whl.name)
+
+    os.mkdir(directory)
+    whl.unzip(directory)
+
+    # Note: Order of operations matters here
+    purelib.spread_purelib_into_root(directory)
+    setup_namespace_pkg_compatibility(directory)
+
+    with open(os.path.join(directory, "BUILD"), "w") as build_file:
+        build_file.write(
+            generate_build_file_contents(
+                sanitise_name(whl.name),
+                [
+                    '"//%s"' % sanitise_name(d)
+                    for d in sorted(whl.dependencies(extras_requested=extras))
+                ],
+            )
+        )
+
+    os.remove(whl.path)
+
+    return "//%s" % directory

extract_wheels/lib/bazel.py

@@ -7,8 +7,6 @@
 import pkg_resources
 import pkginfo
 
-from extract_wheels.lib import bazel, purelib
-
 
 class Wheel:
     """Representation of the compressed .whl file"""
@@ -118,40 +116,3 @@ def parse_wheel_meta_file(wheel_dir: str) -> Dict[str, str]:
                     "Encounted invalid line in WHEEL file: '%s'" % cleaned
                 )
     return contents
-
-
-def extract_wheel(wheel_file: str, extras: List[str]) -> str:
-    """Extracts wheel into given directory and creates a py_library target.
-
-    Args:
-        wheel_file: the filepath of the .whl
-        extras: a list of extras to add as dependencies for the installed wheel
-
-    Returns:
-        The Bazel label for the extracted wheel, in the form '//path/to/wheel'.
-    """
-
-    whl = Wheel(wheel_file)
-    directory = bazel.sanitise_name(whl.name)
-
-    os.mkdir(directory)
-    whl.unzip(directory)
-
-    # Note: Order of operations matters here
-    purelib.spread_purelib_into_root(directory)
-    bazel.setup_namespace_pkg_compatibility(directory)
-
-    with open(os.path.join(directory, "BUILD"), "w") as build_file:
-        build_file.write(
-            bazel.generate_build_file_contents(
-                bazel.sanitise_name(whl.name),
-                [
-                    '"//%s"' % bazel.sanitise_name(d)
-                    for d in sorted(whl.dependencies(extras_requested=extras))
-                ],
-            )
-        )
-
-    os.remove(whl.path)
-
-    return "//%s" % directory