Get sdist builds going with python3 -m build

Author: arrdem

requirements.in

@@ -1,3 +1,5 @@
+setuptools
+build
 django~=4.2.7
 colorama~=0.4.0
 click
@@ -8,4 +10,4 @@ snakesay
 ftfy==6.2.0
 neptune==1.10.2
 six
-bazel-runfiles
+bazel-runfiles

requirements.txt

@@ -38,6 +38,10 @@ bravado==11.0.3 \
 bravado-core==6.1.1 \
     --hash=sha256:8cf1f7bbac2f7c696d37e970253938b5be4ddec92c8d5e64400b17469c3714b4
     # via bravado
+build==1.3.0 \
+    --hash=sha256:698edd0ea270bde950f53aed21f3a0135672206f3911e0176261a31e0e07b397 \
+    --hash=sha256:7145f0b5061ba90a1500d60bd1b13ca0a8a4cebdd0cc16ed8adf1c0e739f43b4
+    # via -r requirements.in
 certifi==2024.7.4 \
     --hash=sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b \
     --hash=sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90
@@ -245,6 +249,10 @@ idna==3.7 \
     # via
     #   jsonschema
     #   requests
+importlib-metadata==8.7.0 \
+    --hash=sha256:d13b81ad223b890aa16c5471f2ac3056cf76c5f10f82d6f9292f0b415f389000 \
+    --hash=sha256:e5dd1551894c77868a30651cef00984d50e1002d06942a7101d34870c5f02afd
+    # via build
 iniconfig==2.0.0 \
     --hash=sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3 \
     --hash=sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374
@@ -393,6 +401,7 @@ packaging==24.0 \
     --hash=sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5 \
     --hash=sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9
     # via
+    #   build
     #   neptune
     #   pytest
 pandas==2.2.2 \
@@ -523,6 +532,10 @@ pyjwt==2.8.0 \
     --hash=sha256:57e28d156e3d5c10088e0c68abb90bfac3df82b40a71bd0daa20c65ccd5c23de \
     --hash=sha256:59127c392cc44c2da5bb3192169a91f429924e17aff6534d70fdc02ab3e04320
     # via neptune
+pyproject-hooks==1.2.0 \
+    --hash=sha256:1e859bd5c40fae9448642dd871adf459e5e2084186e8d2c2a79a824c970da1f8 \
+    --hash=sha256:9e5c6bfa8dcc30091c74b0cf803c81fdd29d94f01992a7707bc97babb1141913
+    # via build
 pytest==8.1.1 \
     --hash=sha256:2a8386cfc11fa9d2c50ee7b2a57e7d898ef90470a7a34c4b949ff59662bb78b7 \
     --hash=sha256:ac978141a75948948817d360297b7aae0fcb9d6ff6bc9ec6d514b85d5a65c044
@@ -864,7 +877,9 @@ swagger-spec-validator==3.0.3 \
 tomli==2.0.1 \
     --hash=sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc \
     --hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f
-    # via pytest
+    # via
+    #   build
+    #   pytest
 types-python-dateutil==2.9.0.20240316 \
     --hash=sha256:5d2f2e240b86905e40944dd787db6da9263f0deabef1076ddaed797351ec0202 \
     --hash=sha256:6b8cb66d960771ce5ff974e9dd45e38facb81718cc1e208b10b1baccbfdbee3b
@@ -904,3 +919,13 @@ websocket-client==1.8.0 \
     --hash=sha256:17b44cc997f5c498e809b22cdf2d9c7a9e71c02c8cc2b6c56e7c2d1239bfa526 \
     --hash=sha256:3239df9f44da632f96012472805d40a23281a991027ce11d2f45a6f24ac4c3da
     # via neptune
+zipp==3.23.0 \
+    --hash=sha256:071652d6115ed432f5ce1d34c336c0adfd6a884660d1e9712a256d3d3bd4b14e \
+    --hash=sha256:a07157588a12518c9d4034df3fbbee09c814741a33ff63c05fa29d26a2404166
+    # via importlib-metadata
+
+# The following packages are considered to be unsafe in a requirements file:
+setuptools==80.9.0 \
+    --hash=sha256:062d34222ad13e0cc312a4c02d73f059e86a4acbfbdea8f8f76b28c99f306922 \
+    --hash=sha256:f36b47402ecde768dbfafc46e8e4207b4360c654f1f3bb84475f0a28628fb19c
+    # via -r requirements.in

uv.lock

@@ -373,9 +373,13 @@ def _sbuild_repos(module_ctx, lock_specs, override_specs):
                 sdist_build(
                     name = name,
                     src = "@" + _sdist_repo_name(package) + "//file",
+                    # FIXME: Add support for build deps and annotative build deps
                     deps = [
                         "@" + _venv_target(hub_name, venv_name, package["name"])
-                        for package in package.get("dependencies", [])
+                        for package in package.get("build-dependencies", [
+                            {"name": "setuptools"},
+                            {"name": "build"}
+                        ])
                     ],
                 )
 
@@ -448,7 +452,7 @@ def _collect_entrypoints(module_ctx, lock_specs):
                 res = module_ctx.execute(
                     [
                         "tar",  # FIXME: Use a hermetic tar here somehow?
-                        "-xOzf",
+                        "-xzOif",
                         file,
                         "*.dist-info/entry_points.txt",
                     ],
@@ -460,6 +464,11 @@ def _collect_entrypoints(module_ctx, lock_specs):
                         entrypoints[package["name"]][normalize_name(name)] = entrypoint
 
                     packages_to_collect.pop(package["name"])
+                else:
+                    fail("Unable to analyze wheel for %s\n%s" % (package["name"], res.stderr))
+
+    if packages_to_collect:
+        fail("Unable to identify entrypoints for %r", packages_to_collect.keys())
 
     return entrypoints
 
@@ -702,14 +711,14 @@ def _uv_impl(module_ctx):
     lock_specs = _parse_locks(module_ctx, venv_specs)
 
     override_specs = _parse_overrides(module_ctx, venv_specs)
-    print(override_specs)
     # Roll through all the configured wheels, collect & validate the unique
     # platform configurations so that we can go create an appropriate power set
     # of conditions.
     configurations = _collect_configurations(module_ctx, lock_specs)
 
     # Collect declared entrypoints for packages
     entrypoints = _collect_entrypoints(module_ctx, lock_specs)
+    print(entrypoints)
 
     # Roll through and create sdist and whl repos for all configured sources
     # Note that these have no deps to this point

uv/private/extension.bzl

@@ -20,3 +20,5 @@ bzl_library(
     srcs = ["repository.bzl"],
     deps = [":rule"],
 )
+
+exports_files(["build_helper.py"])

uv/private/sdist_build/BUILD.bazel

@@ -0,0 +1,34 @@
+#!/usr/bin/env python3
+
+from argparse import ArgumentParser
+from shutil import copytree
+import sys
+from tempfile import mkdtemp
+from os import chdir, path
+from runpy import run_module
+
+# Under Bazel, the source dir of a sdist to build is immutable. `build` and
+# other tools however are constitutionally incapable of not writing to the
+# source tree.
+#
+# As a workaround, we use this launcher which exists to do two things.
+# - It makes a writable tempdir with a copy of the source tree
+# - It punts to `build` targeting the tempdir
+
+PARSER = ArgumentParser()
+PARSER.add_argument("srcdir")
+PARSER.add_argument("outdir")
+opts, args = PARSER.parse_known_args()
+
+t = mkdtemp()
+copytree(opts.srcdir, t, dirs_exist_ok=True)
+outdir = path.abspath(opts.outdir)
+sys.argv.pop()
+sys.argv.pop()
+sys.argv.extend([
+    "--wheel",
+    "--no-isolation",
+    "--outdir", outdir,
+    t,
+])
+run_module("build")

uv/private/sdist_build/build_helper.py

@@ -9,11 +9,17 @@ sibling `rule.bzl` file for the implementation of `sdist_build`.
 def _sdist_build_impl(repository_ctx):
     repository_ctx.file("BUILD.bazel", content = """
 load("@aspect_rules_py//uv/private/sdist_build:rule.bzl", "sdist_build")
+load("@aspect_rules_py//py/unstable:defs.bzl", "py_venv")
 
+py_venv(
+    name = "build_venv",
+    deps = {deps},
+)
+    
 sdist_build(
     name = "whl",
     src = "{src}",
-    deps = {deps},
+    venv = ":build_venv",
     visibility = ["//visibility:public"],
 )
 """.format(

uv/private/sdist_build/repository.bzl

@@ -4,6 +4,7 @@ Actually building sdists.
 
 # buildifier: disable=bzl-visibility
 load("//py/private/toolchain:types.bzl", "PY_TOOLCHAIN")
+load("//py/private/py_venv:py_venv.bzl", "VirtualenvInfo")
 
 TAR_TOOLCHAIN = "@tar.bzl//tar/toolchain:type"
 UV_TOOLCHAIN = "@multitool//tools/uv:toolchain_type"
@@ -42,6 +43,9 @@ def _sdist_build(ctx):
         "build",
     )
 
+    venv = ctx.attr.venv
+    print(venv[VirtualenvInfo], venv[DefaultInfo])
+    
     # Options here:
     # 1. Use `uv build` and provide it the path for our Python toolchain
     # 2. Use the Python toolchain and a downloaded build.
@@ -50,21 +54,17 @@ def _sdist_build(ctx):
     #
     # We're going with #1 for now.
     ctx.actions.run(
-        executable = uv.executable,
+        executable = venv[VirtualenvInfo].home.path + "/bin/python3",
         arguments = [
-            "build",
-            "--wheel",
-            "--offline",
-            "--no-cache",
-            "--out-dir",
+            ctx.file._helper.path,
             wheel_dir.path,
-            "--python",
-            py_toolchain.interpreter.path,
             unpacked_sdist.path,
         ],
         inputs = [
             unpacked_sdist,
-        ] + py_toolchain.files.to_list(),
+            venv[VirtualenvInfo].home,
+            ctx.file._helper,
+        ] + py_toolchain.files.to_list() + ctx.attr.venv[DefaultInfo].files.to_list(),
         outputs = [
             wheel_dir,
         ],
@@ -88,7 +88,8 @@ specified Python dependencies under the configured Python toochain.
 """,
     attrs = {
         "src": attr.label(doc = ""),
-        "deps": attr.label_list(doc = ""),
+        "venv": attr.label(doc = ""),
+        "_helper": attr.label(allow_single_file = True, default = Label(":build_helper.py"))
     },
     toolchains = [
         # TODO: Py toolchain needs to be in the `host` configuration, not the