Remove the macro-generator

Author: philsc

.bazelrc

@@ -36,5 +36,3 @@ build:rtd --enable_bzlmod
 common --incompatible_python_disallow_native_rules
 
 build --lockfile_mode=update
-
-run:repl --//python/config_settings:bootstrap_impl=script //python/bin:repl

python/bin/repl.py

@@ -2,6 +2,10 @@
 from pathlib import Path
 
 def start_repl():
+    # Point libedit/readline at the correct terminfo databases.
+    # https://github.com/astral-sh/python-build-standalone/blob/f0abfc9cb1f6a985fc5561cf5435f7f6e8a64e5b/docs/quirks.rst#backspace-key-doesnt-work-in-python-repl
+    os.environ["TERMINFO_DIRS"] = "/etc/terminfo:/lib/terminfo:/usr/share/terminfo"
+
     # Simulate Python's behavior when a valid startup script is defined by the
     # PYTHONSTARTUP variable. If this file path fails to load, print the error
     # and revert to the default behavior.

python/private/py_library_macro.bzl

@@ -14,35 +14,8 @@
 """Implementation of macro-half of py_library rule."""
 
 load(":py_library_rule.bzl", py_library_rule = "py_library")
-load(":py_binary_rule.bzl", py_binary_rule = "py_binary")
-
-# The py_library's attributes we don't want to forward to auto-generated
-# targets.
-_LIBRARY_ONLY_ATTRS = [
-    "srcs",
-    "deps",
-    "data",
-    "imports",
-]
 
 # A wrapper macro is used to avoid any user-observable changes between a
 # rule and macro. It also makes generator_function look as expected.
-def py_library(name, **kwargs):
-    library_only_attrs = {
-        attr: kwargs.pop(attr, None)
-        for attr in _LIBRARY_ONLY_ATTRS
-    }
-    py_library_rule(
-        name = name,
-        **(library_only_attrs | kwargs)
-    )
-    py_binary_rule(
-        name = "%s.repl" % name,
-        srcs = [],
-        main_module = "python.bin.repl",
-        deps = [
-            ":%s" % name,
-            "@rules_python//python/bin:repl",
-        ],
-        **kwargs
-    )
+def py_library(**kwargs):
+    py_library_rule(**kwargs)

python/private/sentinel.bzl

@@ -18,8 +18,6 @@ Label attributes with defaults cannot accept None, otherwise they fall
 back to using the default. A sentinel allows detecting an intended None value.
 """
 
-load("//python:py_info.bzl", "PyInfo")
-
 SentinelInfo = provider(
     doc = "Indicates this was the sentinel target.",
     fields = [],
@@ -31,7 +29,6 @@ def _sentinel_impl(ctx):
         SentinelInfo(),
         # Also output ToolchainInfo to allow it to be used for noop toolchains
         platform_common.ToolchainInfo(),
-        PyInfo(transitive_sources=depset()),
     ]
 
 sentinel = rule(implementation = _sentinel_impl)

python/private/stage1_bootstrap_template.sh

@@ -238,10 +238,6 @@ command=(
   "$@"
 )
 
-# Point libedit/readline at the correct terminfo databases.
-# https://github.com/astral-sh/python-build-standalone/blob/f0abfc9cb1f6a985fc5561cf5435f7f6e8a64e5b/docs/quirks.rst#backspace-key-doesnt-work-in-python-repl
-export TERMINFO_DIRS=/etc/terminfo:/lib/terminfo:/usr/share/terminfo
-
 # We use `exec` instead of a child process so that signals sent directly (e.g.
 # using `kill`) to this process (the PID seen by the calling process) are
 # received by the Python process. Otherwise, this process receives the signal

python/private/stage2_bootstrap_template.py

@@ -372,9 +372,14 @@ def main():
         # TODO(philsc): Can we point at python.bin.repl instead? That would mean
         # adding it as a dependency to all binaries.
         MAIN_MODULE = "code"
+
         # Prevent subprocesses from also entering the REPL.
         del os.environ["RULES_PYTHON_BOOTSTRAP_REPL"]
 
+        # Point libedit/readline at the correct terminfo databases.
+        # https://github.com/astral-sh/python-build-standalone/blob/f0abfc9cb1f6a985fc5561cf5435f7f6e8a64e5b/docs/quirks.rst#backspace-key-doesnt-work-in-python-repl
+        os.environ["TERMINFO_DIRS"] = "/etc/terminfo:/lib/terminfo:/usr/share/terminfo"
+
     main_rel_path = None
     # todo: things happen to work because find_runfiles_root
     # ends up using stage2_bootstrap, and ends up computing the proper